Merge branch 'master' of https://github.com/fourtf/chatterino2

2018-02-05 21:20:38 +01:00
parent b351c40d29 556dbe0456
commit a44758ad23
23 changed files with 255 additions and 104 deletions
@@ -85,12 +85,16 @@ void ResizingTextEdit::keyPressEvent(QKeyEvent *event)

    if (doComplete) {
        // check if there is a completer
-        return_if_not(this->completer);
+        if (!this->completer) {
+            return;
+        }

        QString currentCompletionPrefix = this->textUnderCursor();

        // check if there is something to complete
-        return_if_not(currentCompletionPrefix.size());
+        if (!currentCompletionPrefix.size()) {
+            return;
+        }

        auto *completionModel =
            static_cast<chatterino::singletons::CompletionModel *>(this->completer->model());