diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-01-16 05:45:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-01-16 05:45:52 +0300 |
| commit | 5c4c66c0873e2b21d87929ab7e3389883c4ee074 (patch) | |
| tree | 1c14043c6b4d6089e0f15006f902b4ef8697be26 /src/gui/windows | |
| parent | 43abb22c0626529c8465f25bd62b813898abe840 (diff) | |
| download | plus-5c4c66c0873e2b21d87929ab7e3389883c4ee074.tar.gz plus-5c4c66c0873e2b21d87929ab7e3389883c4ee074.tar.bz2 plus-5c4c66c0873e2b21d87929ab7e3389883c4ee074.tar.xz plus-5c4c66c0873e2b21d87929ab7e3389883c4ee074.zip | |
Fix code style.
Diffstat (limited to 'src/gui/windows')
| -rw-r--r-- | src/gui/windows/charselectdialog.cpp | 1 | ||||
| -rw-r--r-- | src/gui/windows/chatwindow.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 46810c2cd..5038195d2 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -164,6 +164,7 @@ CharSelectDialog::CharSelectDialog(LoginData &data) : CharSelectDialog::~CharSelectDialog() { + mDeleteDialog = nullptr; } void CharSelectDialog::postInit() diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index d0284af94..0b4d550dd 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -1741,7 +1741,7 @@ bool ChatWindow::resortChatLog(std::string line, tryRemoveColors); } } - else if ((localChatTab != nullptr) && channel.empty()) + else if (localChatTab != nullptr) { localChatTab->chatLog(line, own, ignoreRecord, tryRemoveColors); } |