Merge pull request splewis#966 from splewis/development

* Add missing event parameter to Get5_OnEvent forward (splewis#964) * Use correct argument for demo file deletion when using subfolders (splewis#965)
dekhu48 · Jan 16, 2023 · 4d7b8f5 · 4d7b8f5
2 parents 7f12495 + f206105
commit 4d7b8f5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/scripting/get5/recording.sp b/scripting/get5/recording.sp
@@ -254,8 +254,8 @@ static void DemoRequest_Callback(Handle request, bool failure, bool requestSucce
     if (deleteAfterUpload) {
       LogDebug(
         "get5_demo_delete_after_upload set to true when demo request started; deleting the file from the game server.");
-      if (FileExists(demoFileName) && !DeleteFile(demoFileName)) {
-        LogError("Unable to delete demo file %s.", demoFileName);
+      if (FileExists(demoFilePath) && !DeleteFile(demoFilePath)) {
+        LogError("Unable to delete demo file %s.", demoFilePath);
       }
     }
   }

diff --git a/scripting/get5/version.sp b/scripting/get5/version.sp
@@ -1,6 +1,6 @@
 #tryinclude "manual_version.sp"
 #if !defined PLUGIN_VERSION
-#define PLUGIN_VERSION "0.12.0-dev"
+#define PLUGIN_VERSION "0.12.1-dev"
 #endif
 
 // This MUST be the latest version in x.y.z semver format followed by -dev.

diff --git a/scripting/include/get5.inc b/scripting/include/get5.inc
@@ -1729,7 +1729,7 @@ stock void ConvertBombSiteToStringInJson(const JSON_Object obj, const char[] key
 }
 
 // Called each get5-event with JSON formatted event text.
-forward void Get5_OnEvent(const Get5Event, const char[] eventJson);
+forward void Get5_OnEvent(const Get5Event event, const char[] eventJson);
 
 // Called when a series is first setup.
 // Note: Do not rely on the state of any cvars at this point.