diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp
index 3eec0758e..67ce2c4da 100644
--- a/Minecraft.Client/Minecraft.cpp
+++ b/Minecraft.Client/Minecraft.cpp
@@ -528,7 +528,7 @@ File Minecraft::getWorkingDirectory(const std::wstring& applicationName) {
 
 LevelStorageSource* Minecraft::getLevelSource() { return levelSource; }
 
-void Minecraft::setScreen(Screen* screen) {
+void Minecraft::setScreen(Screen* m_screen) {
     if (dynamic_cast<ErrorScreen*>(this->screen) != NULL) return;
 
     if (this->screen != NULL) {
@@ -542,12 +542,12 @@ void Minecraft::setScreen(Screen* screen) {
     }
     stats->forceSave();*/
 
-    if (screen == NULL && level == NULL) {
-        screen = new TitleScreen();
+    if (m_screen == NULL && level == NULL) {
+        m_screen = new TitleScreen();
     } else if (player != NULL && !ui.GetMenuDisplayed(player->GetXboxPad()) &&
                player->getHealth() <= 0) {
 #ifdef ENABLE_JAVA_GUIS
-        screen = new DeathScreen();
+        m_screen = new DeathScreen();
 #else
         // 4J Stu - If we exit from the death screen then we are saved as being
         // dead. In the Java game when you load the game you are still dead, but
@@ -566,7 +566,7 @@ void Minecraft::setScreen(Screen* screen) {
         gui->clearMessages();
     }
 
-    this->screen = screen;
+    this->screen = m_screen;
     if (screen != NULL) {
         //        releaseMouse();	// 4J - removed
         ScreenSizeCalculator ssc(options, width, height);
@@ -626,13 +626,13 @@ void Minecraft::destroy() {
     setLevel(NULL);
     //    } catch (Throwable e) {
     //    }
-
-    if (screen == NULL && level == NULL) {
-        screen = new TitleScreen();
+    Screen* m_screen = screen;
+    if (m_screen == NULL && level == NULL) {
+        m_screen = new TitleScreen();
     } else if (player != NULL && !ui.GetMenuDisplayed(player->GetXboxPad()) &&
                player->getHealth() <= 0) {
 #ifdef ENABLE_JAVA_GUIS
-        screen = new DeathScreen();
+        m_screen = new DeathScreen();
 #else
         // 4J Stu - If we exit from the death screen then we are saved as being
         // dead. In the Java game when you load the game you are still dead, but
@@ -646,12 +646,12 @@ void Minecraft::destroy() {
 #endif
     }
 
-    if (screen != NULL && dynamic_cast<TitleScreen*>(screen) != NULL) {
+    if (m_screen != NULL && dynamic_cast<TitleScreen*>(m_screen) != NULL) {
         options->renderDebug = false;
         gui->clearMessages();
     }
 
-    this->screen = screen;
+    this->screen = m_screen;
     if (screen != NULL) {
         //        releaseMouse();	// 4J - removed
         ScreenSizeCalculator ssc(options, width, height);