diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2014-08-10 17:51:47 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2014-08-10 17:51:47 +0200 |
| commit | 9de086390bc925b6eb8cbfe332c1985e4b715d61 (patch) | |
| tree | 4dc013b25fc71a0b9a34dc4d2c8d2463c5911254 /src/ui/edit.cpp | |
| parent | ac019c263d7b41742934a9dafd58ac2e6171109c (diff) | |
| download | colobot-9de086390bc925b6eb8cbfe332c1985e4b715d61.tar.gz colobot-9de086390bc925b6eb8cbfe332c1985e4b715d61.tar.bz2 colobot-9de086390bc925b6eb8cbfe332c1985e4b715d61.zip | |
Remove some more delete checks (#318)
Diffstat (limited to 'src/ui/edit.cpp')
| -rw-r--r-- | src/ui/edit.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp index 24d02e9..4132896 100644 --- a/src/ui/edit.cpp +++ b/src/ui/edit.cpp @@ -115,21 +115,16 @@ CEdit::CEdit () : CControl () CEdit::~CEdit() { - int i; - FreeImage(); - for ( i=0 ; i<EDITUNDOMAX ; i++ ) + for (int i = 0; i < EDITUNDOMAX; i++) { delete m_undo[i].text; m_undo[i].text = nullptr; } - if (m_text != nullptr) - { - delete[] m_text; - m_text = nullptr; - } + delete[] m_text; + m_text = nullptr; delete m_scroll; m_scroll = nullptr; @@ -1479,8 +1474,7 @@ bool CEdit::ReadText(std::string filename, int addSize) FreeImage(); - if (m_text != nullptr) - delete[] m_text; + delete[] m_text; m_text = new char[m_maxChar+1]; memset(m_text, 0, m_maxChar+1); @@ -1958,8 +1952,7 @@ void CEdit::SetMaxChar(int max) { FreeImage(); - if (m_text != nullptr) - delete[] m_text; + delete[] m_text; m_maxChar = max; |