From 2f0227755bfc1cf8f4a825341581d547624181a7 Mon Sep 17 00:00:00 2001 From: mfeemster Date: Sat, 12 Sep 2015 20:10:47 -0700 Subject: [PATCH] --User changes: Resize options and about dialogs for Linux. --Bug fixes: Null check on file close in ReadFile(). --- Source/Ember/Utils.h | 1 + Source/Fractorium/AboutDialog.ui | 4 ++-- Source/Fractorium/OptionsDialog.ui | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/Ember/Utils.h b/Source/Ember/Utils.h index b225c1a..2e021b8 100644 --- a/Source/Ember/Utils.h +++ b/Source/Ember/Utils.h @@ -211,6 +211,7 @@ static bool ReadFile(const char* filename, string& buf, bool nullTerminate = tru } fclose(f); + f = nullptr; } } catch (const std::exception& e) diff --git a/Source/Fractorium/AboutDialog.ui b/Source/Fractorium/AboutDialog.ui index 20ef315..c87321e 100644 --- a/Source/Fractorium/AboutDialog.ui +++ b/Source/Fractorium/AboutDialog.ui @@ -7,7 +7,7 @@ 0 0 596 - 622 + 651 @@ -82,7 +82,7 @@ 5 156 585 - 458 + 483 diff --git a/Source/Fractorium/OptionsDialog.ui b/Source/Fractorium/OptionsDialog.ui index 3ca93c9..525b5e5 100644 --- a/Source/Fractorium/OptionsDialog.ui +++ b/Source/Fractorium/OptionsDialog.ui @@ -7,11 +7,11 @@ 0 0 427 - 415 + 487 - + 0 0 @@ -25,7 +25,7 @@ 16777215 - 415 + 16777215 @@ -180,7 +180,7 @@ 0 - 91 + 87