修复帧栏工具回调报错

AniBullet · Sep 10, 2022 · b0e18f7 · b0e18f7
1 parent 9e92612
commit b0e18f7
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 17 deletions.
diff --git a/_BsKeyTools/Scripts/BulletScripts/BsTrackBarTools.ms b/_BsKeyTools/Scripts/BulletScripts/BsTrackBarTools.ms
@@ -3,7 +3,7 @@
  * @Author: Bullet.S
  * @Date: 2021-05-08 17:18:12
  * @LastEditors: Bullet.S
- * @LastEditTime: 2022-09-09 18:26:51
+ * @LastEditTime: 2022-09-10 18:01:30
  * @Email: animator.bullet@foxmail.com
  */
 
@@ -12,8 +12,6 @@ if form != undefined then (form.close();form = undefined)
 try (cui.UnRegisterDialogBar rolBsTrackBarTools) catch()
 try (destroyDialog rolBsTrackBarTools) catch()
 try (destroydialog rolBsBackupManager) catch()
-try (callbacks.removeScripts #filePostOpen id:#UpdateBsBackup) catch ()
-try (callbacks.removeScripts #filePostSave id:#UpdateBsBackup) catch ()
 
 global rolBsTrackBarTools
 global rolBsBackupManager
@@ -524,13 +522,13 @@ rollout rolBsTrackBarTools "BsTrackBarTools_v1.0"
 		)
 		if numFiles == 0 then 
 		(
-			fnButtonStyle btnFilesCount ("暂无备份")
+			fnButtonStyle rolBsTrackBarTools.btnFilesCount ("暂无备份")
 		)
 		else 
 		(
-			fnButtonStyle btnFilesCount ("当前版本" + numFiles as string)
+			fnButtonStyle rolBsTrackBarTools.btnFilesCount ("当前版本" + numFiles as string)
 		)
-		btnFilesCount.FlatAppearance.BorderColor = mcolor.white 
+		rolBsTrackBarTools.btnFilesCount.FlatAppearance.BorderColor = mcolor.white 
 	)
 
 	fn fnQuickSave =
@@ -608,6 +606,10 @@ rollout rolBsTrackBarTools "BsTrackBarTools_v1.0"
 		stLoadConfigAll.fnLoadConfigTrackBarTools()
 		stSetConfigAll.fnSetConfigTrackBarTools()
 		fnLoadDockPos rolBsTrackBarTools widthBsSize heightBsSize
+		callbacks.removeScripts #filePostOpen id:#UpdateBsBackup
+		callbacks.removeScripts #filePostSave id:#UpdateBsBackup
+		callbacks.addScript #filePostOpen "rolBsTrackBarTools.fnFilesCount()" id:#UpdateBsBackup
+		callbacks.addScript #filePostSave "rolBsTrackBarTools.fnFilesCount()" id:#UpdateBsBackup
 		callbacks.removeScripts id:#SaveButtonCallback
 		callbacks.addScript #filePostOpenProcess "rolBsTrackBarTools.clock.ticks = 0" id:#SaveButtonCallback
 
@@ -661,6 +663,8 @@ rollout rolBsTrackBarTools "BsTrackBarTools_v1.0"
 		iniPosAutoBackup = (GetDialogPos rolBsTrackBarTools)
 		-- iniDockPos = ((cui.getDockState rolBsTrackBarTools) as string)
 		-- print iniDockPos
+		callbacks.removeScripts #filePostOpen id:#UpdateBsBackup
+		callbacks.removeScripts #filePostSave id:#UpdateBsBackup
 		stSetConfigAll.fnSetConfigTrackBarTools()
 		callbacks.removeScripts id:#SaveButtonCallback
 		callbacks.removeScripts id:#SaveButtonResetCallback
@@ -1095,6 +1099,8 @@ rollout rolBsBackupManager "" width:355 height:260
 
 	on rolBsBackupManager open do 
 	(
+		callbacks.removeScripts #filePostOpen id:#BsBackupManager
+		callbacks.removeScripts #filePostSave id:#BsBackupManager
 		callbacks.addScript #filePostOpen "rolBsBackupManager.fnRefreshBackupAll()" id:#BsBackupManager
 		callbacks.addScript #filePostSave "rolBsBackupManager.fnRefreshBackupAll()" id:#BsBackupManager
 		btnRefreshFolder.images  = #("UVWUnwrapModes_16i.bmp","UVWUnwrapModes_16i.bmp",28,3,3,4,4,false,false)
@@ -1107,8 +1113,8 @@ rollout rolBsBackupManager "" width:355 height:260
 	on rolBsBackupManager close do 
 	(
 		iniPosBackupManager = (GetDialogPos rolBsBackupManager)
-		try (callbacks.removeScripts #filePostOpen id:#BsBackupManager) catch ()
-		try (callbacks.removeScripts #filePostSave id:#BsBackupManager) catch ()
+		callbacks.removeScripts #filePostOpen id:#BsBackupManager
+		callbacks.removeScripts #filePostSave id:#BsBackupManager
 	)
 
 	on btnClose pressed do 
@@ -1214,7 +1220,4 @@ rollout rolBsBackupManager "" width:355 height:260
 	(
 		popupMenu menuBsFolder pos:mouse.screenpos
 	)
-)
-
-callbacks.addScript #filePostOpen "rolBsTrackBarTools.fnFilesCount()" id:#UpdateBsBackup
-callbacks.addScript #filePostSave "rolBsTrackBarTools.fnFilesCount()" id:#UpdateBsBackup
+)
diff --git a/_BsKeyTools/Scripts/BulletScripts/BulletKeyTools.ms b/_BsKeyTools/Scripts/BulletScripts/BulletKeyTools.ms
@@ -3,7 +3,7 @@
 * @Author: Bullet.S
 * @Date: 2019-09-28 11:48:53
  * @LastEditors: Bullet.S
- * @LastEditTime: 2022-09-10 15:19:24
+ * @LastEditTime: 2022-09-10 17:57:18
 * @Email: animator.bullet@foxmail.com
 */
 
@@ -18,7 +18,7 @@ try (callbacks.removeScripts #timeunitsChange id:#BsUpdateFps) catch ()
 try (callbacks.removeScripts #filePostOpen id:#BsUpdatePlaySpeed) catch ()
 try (callbacks.removeScripts #timeunitsChange id:#BsUpdatePlaySpeed) catch ()
 
-global curVerBsKeyTools  = "0.9.9.2"
+global curVerBsKeyTools  = "0.9.9.3"
 global verUrlBsKeyTools  = "https://gitee.com/acebullet/BsKeyTools/raw/main/_BsKeyTools/version.dat"
 global oldUrlBskeyTools  = "https://gitee.com/acebullet/BsKeyTools/raw/main/_BsKeyTools/_BsKeyTools%EF%BC%88%E8%A3%85%E5%AE%8C%E9%87%8D%E5%90%AFMAX,%E8%AF%AF%E6%9D%80%E8%AF%B7%E4%BF%A1%E4%BB%BB%EF%BC%89.exe"
 global oldFileBsKeyTools = (getdir #temp) + "\\_BsKeyTools_Classic.exe"

diff --git a/_BsKeyTools/SetupHome_BsKeyTools.nsi b/_BsKeyTools/SetupHome_BsKeyTools.nsi
@@ -2,7 +2,7 @@
 
 ; 安装程序初始定义常量
 !define PRODUCT_NAME "BsKeyTools"
-!define PRODUCT_VERSION "_v0.9.9.2"
+!define PRODUCT_VERSION "_v0.9.9.3"
 !define PRODUCT_PUBLISHER "Bullet.S"
 !define PRODUCT_WEB_SITE "anibullet.com"
 ;!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

diff --git a/_BsKeyTools/Setup_BsKeyTools.nsi b/_BsKeyTools/Setup_BsKeyTools.nsi
@@ -2,7 +2,7 @@
 
 ; 安装程序初始定义常量
 !define PRODUCT_NAME "BsKeyTools"
-!define PRODUCT_VERSION "_v0.9.9.2"
+!define PRODUCT_VERSION "_v0.9.9.3"
 !define PRODUCT_PUBLISHER "Bullet.S"
 !define PRODUCT_WEB_SITE "anibullet.com"
 ;!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"

diff --git a/_BsKeyTools/_BsKeyTools.exe b/_BsKeyTools/_BsKeyTools.exe
diff --git a/_BsKeyTools/_BsKeyTools（装完重启MAX,误杀请信任）.exe b/_BsKeyTools/_BsKeyTools（装完重启MAX,误杀请信任）.exe
diff --git a/_BsKeyTools/version.dat b/_BsKeyTools/version.dat
@@ -1 +1 @@
-0.9.9.2
+0.9.9.3