fix RegisterAutoAssemblerCommand

STNN · Jan 19, 2016 · 665e013 · 665e013
1 parent 5ba83aa
commit 665e013
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/Cheat Engine/LuaStrings.pas b/Cheat Engine/LuaStrings.pas
@@ -43,7 +43,7 @@ function strings_remove(L: Plua_State): integer; cdecl;  //compat with ce 6
   if lua_gettop(L)>=1 then
   begin
     s:=lua_tostring(L, -1);
-    strings.Delete(strings.IndexOf(s));
+    if strings.IndexOf(s)<>-1 then strings.Delete(strings.IndexOf(s));
   end;
 end;
 

diff --git a/Cheat Engine/SynHighlighterAA.pas b/Cheat Engine/SynHighlighterAA.pas
@@ -441,7 +441,7 @@ procedure aa_RemoveExtraCommand(command:pchar);
 begin
   if extracommands<>nil then
   begin
-    extracommands.Delete(extracommands.IndexOf(command));
+    if extracommands.IndexOf(command)<>-1 then extracommands.Delete(extracommands.IndexOf(command));
     if extracommands.Count=0 then
       freeandnil(extracommands);
   end;

diff --git a/Cheat Engine/autoassembler.pas b/Cheat Engine/autoassembler.pas
@@ -185,16 +185,9 @@ procedure RegisterAutoAssemblerCommand(command: string; callback: TAutoAssembler
   if registeredAutoAssemblerCommands=nil then
     registeredAutoAssemblerCommands:=TList.Create;
 
-  command:=uppercase(command);
-  for i:=0 to registeredAutoAssemblerCommands.Count-1 do
-    if TRegisteredAutoAssemblerCommand(registeredAutoAssemblerCommands[i]).command=command then
-    begin
-      //update
-      CleanupLuaCall(tmethod(TRegisteredAutoAssemblerCommand(registeredAutoAssemblerCommands[i]).callback));
-      TRegisteredAutoAssemblerCommand(registeredAutoAssemblerCommands[i]).callback:=nil;//TAutoAssemblerCallback(callback);
-      exit;
-    end;
+  UnregisterAutoAssemblerCommand(command);
 
+  command:=uppercase(command);
   c:=TRegisteredAutoAssemblerCommand.create;
   c.command:=command;
   c.callback:=callback;