Merge branch 'fix-restore-from-tray' into 'dev'
Fix "Opening already running instance" See merge request mx-moment/moment!14
This commit is contained in:
commit
66afe32c8b
|
@ -489,7 +489,7 @@ int main(int argc, char *argv[]) {
|
||||||
app.exit(EXIT_FAILURE);
|
app.exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
component.create(objectContext)->setProperty("settingsFolder", settingsFolder);
|
component.create(objectContext)->setProperty("settingsFolder", "file://"+settingsFolder);
|
||||||
|
|
||||||
// Finally, execute the app. Return its exit code after clearing the lock.
|
// Finally, execute the app. Return its exit code after clearing the lock.
|
||||||
int exit_code = app.exec();
|
int exit_code = app.exec();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user