summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/browserbox.cpp6
-rw-r--r--src/gui/gui.cpp5
-rw-r--r--src/gui/register.cpp6
3 files changed, 4 insertions, 13 deletions
diff --git a/src/gui/browserbox.cpp b/src/gui/browserbox.cpp
index 1f67670e..06660cd5 100644
--- a/src/gui/browserbox.cpp
+++ b/src/gui/browserbox.cpp
@@ -72,10 +72,8 @@ BrowserBox::~BrowserBox()
if (instances == 0)
{
// Clean up static resource font
- if (browserFont) {
- delete browserFont;
- browserFont = NULL;
- }
+ delete browserFont;
+ browserFont = NULL;
}
#endif
}
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 7a57cd00..cb79e54b 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -193,10 +193,7 @@ Gui::~Gui()
delete speechFont;
delete mTop;
delete mImageLoader;
-
- if (mHostImageLoader) {
- delete mHostImageLoader;
- }
+ delete mHostImageLoader;
delete guiInput;
}
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index 39c918f7..c9b9daa7 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -198,11 +198,7 @@ RegisterDialog::action(const std::string& eventId)
mConfirmField->setText("");
}
- if (mWrongRegisterNotice)
- {
- delete mWrongRegisterNotice;
- mWrongRegisterNotice = NULL;
- }
+ delete mWrongRegisterNotice;
mWrongRegisterNotice = new OkDialog("Error", errorMsg.str());
mWrongRegisterNotice->addActionListener(mWrongDataNoticeListener);
}