From f7e0d1e958f3b6a4bfff9ba2c9ade03375e8f9d9 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Fri, 23 Jan 2015 03:01:29 +0200
Subject: ZVISION: Fix shadowed variable

A bug in commit 21e9007d80. Thanks to fingolfin for pointing it out
---
 engines/zvision/file/save_manager.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'engines/zvision')

diff --git a/engines/zvision/file/save_manager.cpp b/engines/zvision/file/save_manager.cpp
index 55be8d2530..1e0c57e2b3 100644
--- a/engines/zvision/file/save_manager.cpp
+++ b/engines/zvision/file/save_manager.cpp
@@ -136,13 +136,15 @@ Common::Error SaveManager::loadGame(int slot) {
 	if (slot >= 0) {
 		saveFile = getSlotFile(slot);
 	} else {
-		Common::File *saveFile = _engine->getSearchManager()->openFile("r.svr");
+		saveFile = _engine->getSearchManager()->openFile("r.svr");
 		if (!saveFile) {
-			saveFile = new Common::File;
-			if (!saveFile->open("r.svr")) {
-				delete saveFile;
+			Common::File *restoreFile = new Common::File();
+			if (!restoreFile->open("r.svr")) {
+				delete restoreFile;
 				return Common::kPathDoesNotExist;
 			}
+
+			saveFile = restoreFile;
 		}
 	}
 
-- 
cgit v1.2.3