Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
UltimateZoneBuilder
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
UltimateZoneBuilder
Commits
349a6b09
Unverified
Commit
349a6b09
authored
10 months ago
by
samwiddowson
Committed by
GitHub
10 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Fixed a crash when adding opening the dialog to add a directory resource on Mono Winforms
parent
e1ce00aa
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Source/Core/Controls/FolderSelectDialog.cs
+4
-0
4 additions, 0 deletions
Source/Core/Controls/FolderSelectDialog.cs
with
4 additions
and
0 deletions
Source/Core/Controls/FolderSelectDialog.cs
+
4
−
0
View file @
349a6b09
...
@@ -283,6 +283,7 @@ namespace CodeImp.DoomBuilder.Controls
...
@@ -283,6 +283,7 @@ namespace CodeImp.DoomBuilder.Controls
{
{
bool
flag
=
false
;
bool
flag
=
false
;
#if !MONO_WINFORMS
if
(
Environment
.
OSVersion
.
Version
.
Major
>=
6
)
if
(
Environment
.
OSVersion
.
Version
.
Major
>=
6
)
{
{
var
r
=
new
Reflector
(
"System.Windows.Forms"
);
var
r
=
new
Reflector
(
"System.Windows.Forms"
);
...
@@ -313,6 +314,7 @@ namespace CodeImp.DoomBuilder.Controls
...
@@ -313,6 +314,7 @@ namespace CodeImp.DoomBuilder.Controls
}
}
else
else
{
{
#endif
var
fbd
=
new
FolderBrowserDialog
();
var
fbd
=
new
FolderBrowserDialog
();
fbd
.
Description
=
this
.
Title
;
fbd
.
Description
=
this
.
Title
;
fbd
.
SelectedPath
=
this
.
InitialDirectory
;
fbd
.
SelectedPath
=
this
.
InitialDirectory
;
...
@@ -320,7 +322,9 @@ namespace CodeImp.DoomBuilder.Controls
...
@@ -320,7 +322,9 @@ namespace CodeImp.DoomBuilder.Controls
if
(
fbd
.
ShowDialog
(
new
WindowWrapper
(
hWndOwner
))
!=
DialogResult
.
OK
)
return
false
;
if
(
fbd
.
ShowDialog
(
new
WindowWrapper
(
hWndOwner
))
!=
DialogResult
.
OK
)
return
false
;
ofd
.
FileName
=
fbd
.
SelectedPath
;
ofd
.
FileName
=
fbd
.
SelectedPath
;
flag
=
true
;
flag
=
true
;
#if !MONO_WINFORMS
}
}
#endif
return
flag
;
return
flag
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment