Extract fps counter drawing

client/CPlayerInterface.cpp

@@ -1617,9 +1617,6 @@ void CPlayerInterface::update()
 		GH.totalRedraw();
 	else
 		GH.simpleRedraw();
-
-	if (settings["general"]["showfps"].Bool())
-		GH.drawFPSCounter();
 }
 
 int CPlayerInterface::getLastIndex( std::string namePrefix)

client/CPreGame.cpp

@@ -537,9 +537,6 @@ void CGPreGame::update()
 	// /FIXME: find out why GH.listInt is empty to begin with
 	if (GH.topInt() != nullptr)
 		GH.topInt()->show(screen);
-
-	if (settings["general"]["showfps"].Bool())
-		GH.drawFPSCounter();
 }
 
 void CGPreGame::openCampaignScreen(std::string name)

client/gui/CGuiHandler.cpp

@@ -414,6 +414,9 @@ void CGuiHandler::renderFrame()
 
 		if(nullptr != curInt)
 			curInt->update();
+		
+		if (settings["general"]["showfps"].Bool())
+			drawFPSCounter();		
 			
 		// draw the mouse cursor and update the screen
 		CCS->curh->render();