From 1e421bda7e6c90767a4912de1913eabc89b264d2 Mon Sep 17 00:00:00 2001
From: MaxED <j.maxed@gmail.com>
Date: Thu, 4 Dec 2014 07:50:01 +0000
Subject: [PATCH] Fixed, Texture Browser form: we should not save "Long texture
names" value when Map.Config.UseLongTextureNames is disabled. Fixed, Linedef
Edit form (UDMF): fixed a crash on opening the form when
"linedefrenderstyles" block was missing from game configuration.
---
Source/Core/Windows/LinedefEditFormUDMF.cs | 14 ++++----------
Source/Core/Windows/TextureBrowserForm.cs | 2 +-
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/Source/Core/Windows/LinedefEditFormUDMF.cs b/Source/Core/Windows/LinedefEditFormUDMF.cs
index 7c609bd12..a0798e33f 100644
--- a/Source/Core/Windows/LinedefEditFormUDMF.cs
+++ b/Source/Core/Windows/LinedefEditFormUDMF.cs
@@ -237,16 +237,10 @@ namespace CodeImp.DoomBuilder.Windows
frontUdmfControls = new List<PairedFieldsControl> { pfcFrontOffsetTop, pfcFrontOffsetMid, pfcFrontOffsetBottom, pfcFrontScaleTop, pfcFrontScaleMid, pfcFrontScaleBottom };
backUdmfControls = new List<PairedFieldsControl> { pfcBackOffsetTop, pfcBackOffsetMid, pfcBackOffsetBottom, pfcBackScaleTop, pfcBackScaleMid, pfcBackScaleBottom };
- // Store renderstyle keys?
- if(General.Map.Config.LinedefRenderStyles.Count > 0)
- {
- renderstyles = new string[General.Map.Config.LinedefRenderStyles.Count];
- General.Map.Config.LinedefRenderStyles.Keys.CopyTo(renderstyles, 0);
- }
- else
- {
- renderStyle.Enabled = false;
- }
+ // Setup renderstyles
+ renderstyles = new string[General.Map.Config.LinedefRenderStyles.Count];
+ General.Map.Config.LinedefRenderStyles.Keys.CopyTo(renderstyles, 0);
+ renderStyle.Enabled = (General.Map.Config.LinedefRenderStyles.Count > 0);
// Fill renderstyles
foreach(KeyValuePair<string, string> lf in General.Map.Config.LinedefRenderStyles)
diff --git a/Source/Core/Windows/TextureBrowserForm.cs b/Source/Core/Windows/TextureBrowserForm.cs
index 7c1f9bcd3..749e0687b 100644
--- a/Source/Core/Windows/TextureBrowserForm.cs
+++ b/Source/Core/Windows/TextureBrowserForm.cs
@@ -447,7 +447,7 @@ namespace CodeImp.DoomBuilder.Windows
//mxd. Save ImageBrowserControl settings
General.Settings.WriteSetting("browserwindow.showtexturesizes", ImageBrowserControl.ShowTextureSizes);
- General.Settings.WriteSetting("browserwindow.uselongtexturenames", ImageBrowserControl.UseLongTextureNames);
+ if(General.Map.Config.UseLongTextureNames) General.Settings.WriteSetting("browserwindow.uselongtexturenames", ImageBrowserControl.UseLongTextureNames);
// Clean up
browser.CleanUp();
--
GitLab