linus/mpv.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show error message box on main window thread.

Browse Source
This commit is contained in:
Frank Skare
2021-05-30 15:08:44 +02:00
parent 539f94d1c9
commit db3018bbf5
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Misc/App.cs
View File

@@ -137,6 +137,8 @@ namespace mpvnet
} }
} }
public static void InvokeOnMainThread(Action action) => MainForm.Instance.BeginInvoke(action);
public static void ShowError(string title, string msg = null) public static void ShowError(string title, string msg = null)
{ {
if (IsStartedFromTerminal) if (IsStartedFromTerminal)
@@ -148,7 +150,7 @@ namespace mpvnet
Terminal.WriteError(msg); Terminal.WriteError(msg);
} }
else else
Msg.ShowError(title, msg); InvokeOnMainThread(() => Msg.ShowError(title, msg));
} }
static void Initialized() static void Initialized()

15
src/Misc/Commands.cs
View File

@@ -53,15 +53,14 @@ namespace mpvnet
case "update-check": UpdateCheck.CheckOnline(true); break; case "update-check": UpdateCheck.CheckOnline(true); break;
case "window-scale": WindowScale(float.Parse(args[0], CultureInfo.InvariantCulture)); break; case "window-scale": WindowScale(float.Parse(args[0], CultureInfo.InvariantCulture)); break;
default: App.ShowError($"No command '{id}' found."); break; default: Terminal.WriteError($"No command '{id}' found."); break;
} }
} }
public static void InvokeOnMainThread(Action action) => MainForm.Instance.BeginInvoke(action);
public static void ShowDialog(Type winType) public static void ShowDialog(Type winType)
{ {
InvokeOnMainThread(new Action(() => { App.InvokeOnMainThread(new Action(() => {
Window win = Activator.CreateInstance(winType) as Window; Window win = Activator.CreateInstance(winType) as Window;
new WindowInteropHelper(win).Owner = MainForm.Instance.Handle; new WindowInteropHelper(win).Owner = MainForm.Instance.Handle;
win.ShowDialog(); win.ShowDialog();
@@ -79,7 +78,7 @@ namespace mpvnet
if (arg == "no-folder") loadFolder = false; if (arg == "no-folder") loadFolder = false;
} }
InvokeOnMainThread(new Action(() => { App.InvokeOnMainThread(new Action(() => {
using (var d = new OpenFileDialog() { Multiselect = true }) using (var d = new OpenFileDialog() { Multiselect = true })
if (d.ShowDialog() == DialogResult.OK) if (d.ShowDialog() == DialogResult.OK)
Core.LoadFiles(d.FileNames, loadFolder, append); Core.LoadFiles(d.FileNames, loadFolder, append);
@@ -88,7 +87,7 @@ namespace mpvnet
public static void Open_DVD_Or_BD_Folder() public static void Open_DVD_Or_BD_Folder()
{ {
InvokeOnMainThread(new Action(() => { App.InvokeOnMainThread(new Action(() => {
using (var dialog = new FolderBrowserDialog()) using (var dialog = new FolderBrowserDialog())
{ {
dialog.Description = "Select a DVD or Blu-ray folder."; dialog.Description = "Select a DVD or Blu-ray folder.";
@@ -230,7 +229,7 @@ namespace mpvnet
public static void OpenURL() public static void OpenURL()
{ {
InvokeOnMainThread(new Action(() => { App.InvokeOnMainThread(new Action(() => {
string clipboard = System.Windows.Forms.Clipboard.GetText(); string clipboard = System.Windows.Forms.Clipboard.GetText();
if (string.IsNullOrEmpty(clipboard) || (!clipboard.Contains("://") && !File.Exists(clipboard)) || if (string.IsNullOrEmpty(clipboard) || (!clipboard.Contains("://") && !File.Exists(clipboard)) ||
@@ -246,7 +245,7 @@ namespace mpvnet
public static void LoadSubtitle() public static void LoadSubtitle()
{ {
InvokeOnMainThread(new Action(() => { App.InvokeOnMainThread(new Action(() => {
using (var d = new OpenFileDialog()) using (var d = new OpenFileDialog())
{ {
string path = Core.get_property_string("path"); string path = Core.get_property_string("path");
@@ -265,7 +264,7 @@ namespace mpvnet
public static void LoadAudio() public static void LoadAudio()
{ {
InvokeOnMainThread(new Action(() => { App.InvokeOnMainThread(new Action(() => {
using (var d = new OpenFileDialog()) using (var d = new OpenFileDialog())
{ {
string path = Core.get_property_string("path"); string path = Core.get_property_string("path");