vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(75834911e) Fixed crash after opening OpenFileDialog more than once on Linux

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-06-11 21:43:23 +03:00
parent 4a401c865d
commit b294aee91e
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Utils/OpenFileDialog.cs
+10 -11
View File
@@ -18,34 +18,33 @@ namespace Barotrauma
public string FileName { get; private set; } public string FileName { get; private set; }
public string[] FileNames { get; private set; } public string[] FileNames { get; private set; }
public OpenFileDialog() public OpenFileDialog() { }
{
ofd = new System.Windows.Forms.OpenFileDialog();
}
public System.Windows.Forms.DialogResult ShowDialog() public System.Windows.Forms.DialogResult ShowDialog()
{ {
ofd = new System.Windows.Forms.OpenFileDialog();
ofd.Multiselect = Multiselect; ofd.Multiselect = Multiselect;
ofd.InitialDirectory = InitialDirectory; ofd.InitialDirectory = InitialDirectory;
ofd.Filter = Filter; ofd.Filter = Filter;
ofd.Title = Title; ofd.Title = Title;
#if LINUX System.Windows.Forms.DialogResult result;
#if LINUX || OSX
var wrapperForm = new WrapperForm(ofd); var wrapperForm = new WrapperForm(ofd);
System.Windows.Forms.Application.Run(wrapperForm); System.Windows.Forms.Application.Run(wrapperForm);
System.Windows.Forms.Application.Exit();
FileName = wrapperForm.FileName; FileName = wrapperForm.FileName;
FileNames = wrapperForm.FileNames; FileNames = wrapperForm.FileNames;
return wrapperForm.Result; result = wrapperForm.Result;
#else #else
var result = ofd.ShowDialog(); result = ofd.ShowDialog();
FileName = ofd.FileName; FileName = ofd.FileName;
FileNames = ofd.FileNames; FileNames = ofd.FileNames;
return result;
#endif #endif
ofd = null;
return result;
} }
#if LINUX #if LINUX || OSX
private class WrapperForm : System.Windows.Forms.Form private class WrapperForm : System.Windows.Forms.Form
{ {
private System.Windows.Forms.OpenFileDialog ofd; private System.Windows.Forms.OpenFileDialog ofd;
@@ -66,7 +65,7 @@ namespace Barotrauma
FileName = ofd.FileName; FileName = ofd.FileName;
FileNames = ofd.FileNames; FileNames = ofd.FileNames;
System.Threading.Thread.Sleep(100); System.Threading.Thread.Sleep(100);
this.Close(); System.Windows.Forms.Application.Exit();
} }
} }
#endif #endif