Fixed issue #2 (Freezing the app when opening a non-existent skin)

Piripe · Sep 1, 2022 · 67428d6 · 67428d6
1 parent 49ba674
commit 67428d6
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/Oxygen/Forms/Welcome.cs b/Oxygen/Forms/Welcome.cs
@@ -180,11 +180,13 @@ private void nextButton_Click(object sender, EventArgs e)
                 }
             });
 
-            progressDialog.ShowDialog();
+            if (progressDialog.ShowDialog() == DialogResult.OK)
+            {
 
-            Global.Editor = new Forms.Editor();
-            Global.Editor.Show();
-            Close();
+                Global.Editor = new Forms.Editor();
+                Global.Editor.Show();
+                Close();
+            }
         }
 
         private void internetSkinPreviewPictureBox_Click(object sender, EventArgs e)

diff --git a/Oxygen/Modules/ProjectManager.cs b/Oxygen/Modules/ProjectManager.cs
@@ -178,8 +178,34 @@ await Task.Factory.StartNew(() => {
                     }
                     else
                     {
-                        System.IO.Compression.ZipFile.ExtractToDirectory(Global.SkinConfig.skinPath??"", Path.Combine(rootWorkingPath, "skin"));
-                        checkIfValidSkin();
+                        if (File.Exists(Global.SkinConfig.skinPath))
+                        {
+                            try
+                            {
+                                System.IO.Compression.ZipFile.ExtractToDirectory(Global.SkinConfig.skinPath ?? "", Path.Combine(rootWorkingPath, "skin"));
+                                checkIfValidSkin();
+                            }
+                            catch
+                            {
+                                MessageBox.Show("Can't extract the skin.");
+                                Task.Factory.StartNew(() => {
+                                    progress.DialogResult = DialogResult.Abort;
+                                }, CancellationToken.None, TaskCreationOptions.None, context);
+
+                                progress.CLIResult = DialogResult.Abort;
+                                progress.drawCLIProgressbar("Error while importing skin: Can't extract the skin.", 100);
+                            }
+                        }
+                        else
+                        {
+                            MessageBox.Show("Invalid skin.");
+                            Task.Factory.StartNew(() => {
+                                progress.DialogResult = DialogResult.Abort;
+                            }, CancellationToken.None, TaskCreationOptions.None, context);
+
+                            progress.CLIResult = DialogResult.Abort;
+                            progress.drawCLIProgressbar("Error while importing skin: Invalid skin.", 100);
+                        }
                     }
                 }
                 else