diff --git a/client/CServerHandler.cpp b/client/CServerHandler.cpp
index ead195106..291fe5b70 100644
--- a/client/CServerHandler.cpp
+++ b/client/CServerHandler.cpp
@@ -689,18 +689,13 @@ void CServerHandler::startCampaignScenario(std::shared_ptr<CampaignState> cs)
 				entry->Bool() = true;
 			}
 
+			GH.windows().pushWindow(CMM);
+			GH.windows().pushWindow(CMM->menu);
+
 			if(!ourCampaign->isCampaignFinished())
-			{
-				GH.windows().pushWindow(CMM);
-				GH.windows().pushWindow(CMM->menu);
 				CMM->openCampaignLobby(ourCampaign);
-			}
 			else
-			{
-				GH.windows().pushWindow(CMM);
-				GH.windows().pushWindow(CMM->menu);
 				CMM->openCampaignScreen(ourCampaign->campaignSet);
-			}
 		};
 		if(epilogue.hasPrologEpilog)
 		{
diff --git a/lib/CConfigHandler.cpp b/lib/CConfigHandler.cpp
index 48a761c83..af4a99eca 100644
--- a/lib/CConfigHandler.cpp
+++ b/lib/CConfigHandler.cpp
@@ -67,7 +67,7 @@ void SettingsStorage::init(const std::string & dataFilename, const std::string &
 	if (!CResourceHandler::get("local")->existsResource(confName))
 		CResourceHandler::get("local")->createResource(dataFilename);
 
-	if(schema != "")
+	if(!schema.empty())
 	{
 		JsonUtils::maximize(config, schema);
 		JsonUtils::validate(config, schema, "settings");
@@ -81,7 +81,7 @@ void SettingsStorage::invalidateNode(const std::vector<std::string> &changedPath
 
 	JsonNode savedConf = config;
 	savedConf.Struct().erase("session");
-	if(schema != "")
+	if(!schema.empty())
 		JsonUtils::minimize(savedConf, schema);
 
 	std::fstream file(CResourceHandler::get()->getResourceName(JsonPath::builtin(dataFilename))->c_str(), std::ofstream::out | std::ofstream::trunc);