chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GUI: Don't allow plugins to run without validating options at least once

Browse Source
This commit is contained in:
Katy Coe
2020-12-26 00:05:48 +01:00
parent 1527c9fe17
commit 94f13c35df
3 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Il2CppInspector.GUI/App.xaml.cs
View File

@@ -70,7 +70,15 @@ namespace Il2CppInspectorGUI
public List<AppModel> AppModels { get; } = new List<AppModel>();
public Exception LastException { get; private set; }
private Exception _lastException;
public Exception LastException {
get {
var ex = _lastException;
_lastException = null;
return ex;
}
private set => _lastException = value;
}
// Event to indicate current work status
public event EventHandler<string> OnStatusUpdate;
@@ -84,8 +92,11 @@ namespace Il2CppInspectorGUI
// Set handlers for plugin manager
PluginManager.ErrorHandler += (s, e) => {
if (e is PluginOptionsChangedEventInfo)
MessageBox.Show("Could not update plugin options. " + e.Error.Exception.Message, "Plugin error");
if (e is PluginOptionsChangedEventInfo oe)
if (oe.Error is PluginOptionErrorEventArgs oea)
MessageBox.Show($"Plugin option '{oea.Option.Description}' for {e.Error.Plugin.Name} is invalid: {e.Error.Exception.Message}", "Plugin error");
else
MessageBox.Show($"One or more plugin options for {e.Error.Plugin.Name} are invalid: {e.Error.Exception.Message}", "Plugin error");
else
MessageBox.Show($"The plugin {e.Error.Plugin.Name} encountered an error while executing {e.Error.Operation}: {e.Error.Exception.Message}."
+ Environment.NewLine + Environment.NewLine + "Plugin has been disabled.", "Plugin error");
@@ -131,6 +142,10 @@ namespace Il2CppInspectorGUI
public Task<bool> LoadMetadataAsync(MemoryStream metadataStream) =>
Task.Run(() => {
try {
// Don't start unless every enabled plugin's options are valid
if (PluginManager.ValidateAllOptions().Error != null)
return false;
metadata = Metadata.FromStream(metadataStream, StatusUpdate);
return true;
}

9
Il2CppInspector.GUI/MainWindow.xaml.cs
View File

@@ -121,7 +121,8 @@ namespace Il2CppInspectorGUI
else {
areaBusyIndicator.Visibility = Visibility.Hidden;
grdFirstPage.Visibility = Visibility.Visible;
MessageBox.Show(this, app.LastException.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
if (app.LastException is Exception e)
MessageBox.Show(this, e.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
}
}
@@ -157,7 +158,8 @@ namespace Il2CppInspectorGUI
else {
areaBusyIndicator.Visibility = Visibility.Hidden;
btnSelectBinaryFile.Visibility = Visibility.Visible;
MessageBox.Show(this, app.LastException.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
if (app.LastException is Exception e)
MessageBox.Show(this, e.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
}
}
@@ -195,7 +197,8 @@ namespace Il2CppInspectorGUI
else {
areaBusyIndicator.Visibility = Visibility.Hidden;
grdFirstPage.Visibility = Visibility.Visible;
MessageBox.Show(this, app.LastException.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
if (app.LastException is Exception e)
MessageBox.Show(this, e.Message, "Error", MessageBoxButton.OK, MessageBoxImage.Error);
}
}