berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

fix opening Settings

This commit is contained in:
nakst 2021-09-17 21:18:20 +01:00
parent c84b5aa60b
commit 777fe2aba2
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
desktop/desktop.cpp
View File

@ -1365,10 +1365,6 @@ bool ApplicationInstanceStart(int64_t applicationID, EsApplicationStartupInforma
instance->tab->notRespondingInstance = nullptr; instance->tab->notRespondingInstance = nullptr;
} }
ApplicationInstanceCleanup(instance);
instance->application = application;
ApplicationProcess *process = application->singleProcess; ApplicationProcess *process = application->singleProcess;
if (application->createInstance) { if (application->createInstance) {
@ -1524,9 +1520,15 @@ bool ApplicationInstanceStart(int64_t applicationID, EsApplicationStartupInforma
application->singleProcess = process; application->singleProcess = process;
} }
instance->process = process; // Increment the instance count before cleaning up the old process,
// so that when going between 2 Desktop instances,
// the Desktop process doesn't exit.
process->instanceCount++; process->instanceCount++;
ApplicationInstanceCleanup(instance);
instance->application = application;
instance->process = process;
if (startupInformation->documentID) { if (startupInformation->documentID) {
instance->documentID = startupInformation->documentID; instance->documentID = startupInformation->documentID;
OpenDocumentOpenReference(instance->documentID); OpenDocumentOpenReference(instance->documentID);