Index: ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml =================================================================== --- ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml +++ ps/trunk/binaries/data/mods/public/gui/session/hotkeys/misc.xml @@ -24,11 +24,11 @@ - Engine.QuickSave(getSavedGameData()); + if (!g_IsNetworked) Engine.QuickSave(getSavedGameData()); - Engine.QuickLoad(); + if (!g_IsNetworked) Engine.QuickLoad(); Index: ps/trunk/source/ps/scripting/JSInterface_SavedGame.cpp =================================================================== --- ps/trunk/source/ps/scripting/JSInterface_SavedGame.cpp +++ ps/trunk/source/ps/scripting/JSInterface_SavedGame.cpp @@ -54,7 +54,9 @@ void JSI_SavedGame::QuickSave(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), JS::HandleValue GUIMetadata) { - if (g_Game) + if (g_NetServer || g_NetClient) + LOGERROR("Can't store quicksave during multiplayer!"); + else if (g_Game) g_Game->GetTurnManager()->QuickSave(GUIMetadata); else LOGERROR("Can't store quicksave if game is not running!"); @@ -62,7 +64,9 @@ void JSI_SavedGame::QuickLoad(ScriptInterface::CxPrivate* UNUSED(pCxPrivate)) { - if (g_Game) + if (g_NetServer || g_NetClient) + LOGERROR("Can't load quicksave during multiplayer!"); + else if (g_Game) g_Game->GetTurnManager()->QuickLoad(); else LOGERROR("Can't load quicksave if game is not running!");