Pop_Slime/crtr
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Activity

Pull up error handling from action to browser.

Browse Source
This commit is contained in:
PopSlime
2023-12-25 15:06:16 +08:00
parent 9bfa7f2048
commit 662cbf0827
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/Cryville/Crtr/Browsing/Actions/OpenConfigAction.cs
View File

@@ -1,6 +1,5 @@
using Cryville.Crtr.Browsing.UI; using Cryville.Crtr.Browsing.UI;
using Cryville.Crtr.Config; using Cryville.Crtr.Config;
using Cryville.Crtr.UI;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Object = UnityEngine.Object; using Object = UnityEngine.Object;
@@ -35,11 +34,9 @@ namespace Cryville.Crtr.Browsing.Actions {
try { try {
browser.Load(ruleset, overrides); browser.Load(ruleset, overrides);
} }
catch (Exception ex) { catch (Exception) {
Dialog.Show(null, ex.Message);
Game.MainLogger.Log(4, "Config", "An error occurred while loading the config: {0}", ex);
Object.Destroy(browser.gameObject); Object.Destroy(browser.gameObject);
return; throw;
} }
_rulesetTabs[ruleset] = master.AddAndOpenTab(string.Format("Config: {0}", ruleset), browser); _rulesetTabs[ruleset] = master.AddAndOpenTab(string.Format("Config: {0}", ruleset), browser);
browser.InitAction(); browser.InitAction();

8
Assets/Cryville/Crtr/Browsing/UI/PathedResourceBrowser.cs
View File

@@ -178,7 +178,13 @@ namespace Cryville.Crtr.Browsing.UI {
return; return;
} }
foreach (var i in _selectedItems) { foreach (var i in _selectedItems) {
action.Invoke(_manager.GetItemUri(i), _manager[i]); try {
action.Invoke(_manager.GetItemUri(i), _manager[i]);
}
catch (Exception ex) {
Dialog.Show(null, ex.Message);
Game.MainLogger.Log(4, "Config", "An error occurred while running the action: {0}", ex);
}
} }
} }
} }