GUI: Make Options dialog stop LocalServer on close

Commit also adds a fix for StorageWizardDialog, where LocalServer was
used even if USE_SDL_NET was undefined.

2 files changed, 9 insertions, 0 deletions

diff --git a/gui/options.cpp b/gui/options.cpp
index f2ae946ff9..0fe4e9f8f4 100644
--- a/gui/options.cpp
+++ b/gui/options.cpp
@@ -1509,6 +1509,11 @@ void GlobalOptionsDialog::close() {
 #endif
 #endif
 	}
+#ifdef USE_SDL_NET
+	if (LocalServer.isRunning()) {
+		LocalServer.stop();
+	}
+#endif
 	OptionsDialog::close();
 }
 
diff --git a/gui/storagewizarddialog.cpp b/gui/storagewizarddialog.cpp
index e3bac98175..d4ad3e32df 100644
--- a/gui/storagewizarddialog.cpp
+++ b/gui/storagewizarddialog.cpp
@@ -100,19 +100,23 @@ void StorageWizardDialog::open() {
 		}
 	}
 
+#ifdef USE_SDL_NET
 	if (Cloud::CloudManager::couldUseLocalServer()) {
 		_stopServerOnClose = !LocalServer.isRunning();
 		LocalServer.start();
 		LocalServer.indexPageHandler().setTarget(this);
 	}
+#endif
 }
 
 void StorageWizardDialog::close() {
+#ifdef USE_SDL_NET
 	if (Cloud::CloudManager::couldUseLocalServer()) {
 		if (_stopServerOnClose)
 			LocalServer.stopOnIdle();
 		LocalServer.indexPageHandler().setTarget(nullptr);
 	}
+#endif
 	Dialog::close();
 }