libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-04 15:51:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Fix SDL_Net-related errors

Browse Source 
Checked by rebuilding ScummVM without SDL_Net in MinGW.

Also fixes StorageWizardDialog's warning about _stopServerOnClose.
This commit is contained in:
Alexander Tkachev 2016-07-25 13:13:47 +06:00
parent c9b819b577
commit 86f7b75dd7
3 changed files with 12 additions and 1 deletions

4
gui/options.cpp

@ -1319,7 +1319,11 @@ GlobalOptionsDialog::GlobalOptionsDialog(LauncherDialog *launcher)
_runServerButton = new ButtonWidget(container, "GlobalOptions_Cloud_Container.RunServerButton", _("Run server"), _("Run local webserver"), kRunServerCmd);
_serverInfoLabel = new StaticTextWidget(container, "GlobalOptions_Cloud_Container.ServerInfoLabel", _("Not running"));
#ifdef USE_SDL_NET
uint32 port = Networking::LocalWebserver::getPort();
#else
uint32 port = 0; // the following widgets are hidden anyway
#endif
_serverPortDesc = new StaticTextWidget(container, "GlobalOptions_Cloud_Container.ServerPortDesc", _("Server's port:"), _("Which port is used by server\nAuth with server is not available with non-default port"));
_serverPort = new EditTextWidget(container, "GlobalOptions_Cloud_Container.ServerPortEditText", Common::String::format("%u", port), 0);
_serverPortClearButton = addClearButton(container, "GlobalOptions_Cloud_Container.ServerPortClearButton", kServerPortClearCmd);

7
gui/storagewizarddialog.cpp

@ -41,7 +41,10 @@ enum {
};
StorageWizardDialog::StorageWizardDialog(uint32 storageId):
Dialog("GlobalOptions_Cloud_ConnectionWizard"), _storageId(storageId), _close(false), _stopServerOnClose(false) {
Dialog("GlobalOptions_Cloud_ConnectionWizard"), _storageId(storageId), _close(false) {
#ifdef USE_SDL_NET
_stopServerOnClose = false;
#endif
_backgroundType = GUI::ThemeEngine::kDialogBackgroundPlain;
Common::String headline = Common::String::format(_("%s Storage Connection Wizard"), CloudMan.listStorages()[_storageId].c_str());
@ -195,10 +198,12 @@ void StorageWizardDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
close();
break;
}
#ifdef USE_SDL_NET
case kStorageCodePassedCmd:
CloudMan.connectStorage(_storageId, LocalServer.indexPageHandler().code());
_close = true;
break;
#endif
default:
Dialog::handleCommand(sender, cmd, data);
}

2
gui/storagewizarddialog.h

@ -46,7 +46,9 @@ class StorageWizardDialog : public Dialog {
StaticTextWidget *_messageWidget;
ButtonWidget *_connectWidget;
bool _close;
#ifdef USE_SDL_NET
bool _stopServerOnClose;
#endif
/** Return short scummvm.org URL for user to navigate to. */
Common::String getUrl() const;