asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #59576 from techiepriyansh/fix-multiple-instances-3.x

Browse source
This commit is contained in:
Rémi Verschelde 2022-07-03 00:22:15 +02:00 committed by GitHub
commit 3000d8d140
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
editor/project_manager.cpp
View file

@ -1022,6 +1022,8 @@ public:
} }
}; };
bool project_opening_initiated;
ProjectList(); ProjectList();
~ProjectList(); ~ProjectList();
@ -1099,6 +1101,7 @@ ProjectList::ProjectList() {
add_child(_scroll_children); add_child(_scroll_children);
_icon_load_index = 0; _icon_load_index = 0;
project_opening_initiated = false;
} }
ProjectList::~ProjectList() { ProjectList::~ProjectList() {
@ -1707,7 +1710,9 @@ void ProjectList::_panel_input(const Ref<InputEvent> &p_ev, Node *p_hb) {
emit_signal(SIGNAL_SELECTION_CHANGED); emit_signal(SIGNAL_SELECTION_CHANGED);
if (!mb->get_control() && mb->is_doubleclick()) { // Do not allow opening a project more than once using a single project manager instance.
// Opening the same project in several editor instances at once can lead to various issues.
if (!mb->get_control() && mb->is_doubleclick() && !project_opening_initiated) {
emit_signal(SIGNAL_PROJECT_ASK_OPEN); emit_signal(SIGNAL_PROJECT_ASK_OPEN);
} }
} }
@ -2035,6 +2040,8 @@ void ProjectManager::_open_selected_projects() {
ERR_FAIL_COND(err); ERR_FAIL_COND(err);
} }
_project_list->project_opening_initiated = true;
_dim_window(); _dim_window();
get_tree()->quit(); get_tree()->quit();
} }