Changeset 6655 for code/branches

Timestamp:

Mar 29, 2010, 11:27:36 PM (15 years ago)

Author:

rgrieder

Message:

Fixed a bug in LuaState that caused Lua Debugger to malfunction when showing lines.

File:

• code/branches/gamestate/src/libraries/core/LuaState.cc (modified) (3 diffs)

code/branches/gamestate/src/libraries/core/LuaState.cc

@@ -114 +114 @@
             luaInput = code;
 
+        if (sourceFileInfo != NULL)
+        {
+            // Also fill a map with the actual source code. This is just for the include* commands
+            // where the content of sourceFileInfo->filename doesn't match 'code'
+            this->sourceCodeMap_[sourceFileInfo->filename] = code;
+        }
+
         this->doString(luaInput, sourceFileInfo);
+
+        if (sourceFileInfo != NULL)
+        {
+            // Delete source code entry
+            if (sourceFileInfo != NULL)
+                this->sourceCodeMap_.erase(sourceFileInfo->filename);
+        }
     }
 
@@ -140 +154 @@
             // The '@' is a Lua convention to identify the chunk name as filename
             chunkname = '@' + sourceFileInfo->filename;
-            
-            // Also fill a map with the actual source code. This is just for the include* commands
-            // where the content of sourceFileInfo->filename doesn't match 'code'
-            this->sourceCodeMap_[sourceFileInfo->filename] = code;
         }
         else
@@ -184 +194 @@
         // Load the old info again
         sourceFileInfo_ = oldSourceFileInfo;
-
-        // Delete source code entry
-        if (sourceFileInfo != NULL)
-            this->sourceCodeMap_.erase(sourceFileInfo->filename);
     }