mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 11:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to prevent segfault when OpenSpace app closes

Browse Source
This commit is contained in:
Gene Payne
2020-10-13 00:31:42 -06:00
parent f2a03ed70e
commit 23af34de83
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
View File

@@ -332,7 +332,9 @@ bool LauncherWindow::loadProfileFromFile(Profile*& p, std::string filename) {
}
LauncherWindow::~LauncherWindow() {
delete myEditorWindow;
if (myEditorWindow != nullptr) {
delete myEditorWindow;
}
}
bool LauncherWindow::wasLaunchSelected() {

23
apps/OpenSpace/main.cpp
View File

@@ -63,6 +63,7 @@
#include <Tracy.hpp>
#include <chrono>
#include <ctime>
#include <memory>
#ifdef WIN32
#include <openspace/openspace.h>
@@ -988,16 +989,14 @@ std::string setWindowConfigPresetForGui(const std::string labelFromCfgFile,
return preset;
}
std::string getSelectedSgctProfileFromLauncher(LauncherWindow* lw, bool hasCliSGCTConfig,
std::string getSelectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTConfig,
std::string windowConfiguration,
const std::string& labelFromCfgFile,
const std::string& xmlExt)
{
std::string config = windowConfiguration;
if (!hasCliSGCTConfig) {
if (lw != nullptr) {
config = lw->selectedWindowConfig();
}
config = lw.selectedWindowConfig();
if (config.find(labelFromCfgFile) != std::string::npos) {
if (config.find("sgct.config") == std::string::npos) {
config = config.substr(0, config.length() - labelFromCfgFile.length());
@@ -1165,16 +1164,16 @@ int main(int argc, char** argv) {
std::string windowCfgPreset = setWindowConfigPresetForGui(labelFromCfgFile, xmlExt,
haveCliSGCTConfig, sgctFunctionName);
QApplication* qaobj = nullptr;
LauncherWindow* launchwin = nullptr;
std::shared_ptr<QApplication> qaobj;
std::shared_ptr<LauncherWindow> launchwin;
bool skipLauncherSinceProfileAndWindowAreConfiguredInCli =
(haveCliProfile && haveCliSGCTConfig) || global::configuration.bypassLauncher;
if (!skipLauncherSinceProfileAndWindowAreConfiguredInCli) {
int qac = 0;
qaobj = new QApplication(qac, nullptr);
launchwin = new LauncherWindow(absPath("${BASE}"), !haveCliProfile,
global::configuration, !haveCliSGCTConfig, windowCfgPreset);
qaobj.reset(new QApplication(qac, nullptr));
launchwin.reset(new LauncherWindow(absPath("${BASE}"), !haveCliProfile,
global::configuration, !haveCliSGCTConfig, windowCfgPreset));
launchwin->show();
qaobj->exec();
@@ -1184,7 +1183,7 @@ int main(int argc, char** argv) {
global::configuration.profile = launchwin->selectedProfile();
windowConfiguration = getSelectedSgctProfileFromLauncher(
launchwin,
*launchwin,
haveCliSGCTConfig,
windowConfiguration,
labelFromCfgFile,
@@ -1306,8 +1305,8 @@ int main(int argc, char** argv) {
}
#endif // OPENSPACE_HAS_SPOUT
delete launchwin;
delete qaobj;
launchwin->close();
qaobj->quit();
ghoul::deinitialize();
exit(EXIT_SUCCESS);