Merge branch 'master' of https://github.com/coder3101/cp-editor

cpeditor · Jan 10, 2020 · 391ff71 · 391ff71
2 parents 24274ad + 1823f00
commit 391ff71
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/appwindow.cpp b/src/appwindow.cpp
@@ -541,18 +541,25 @@ void AppWindow::on_actionUse_Snippets_triggered()
         auto names = settingManager->getSnippetsNames(lang);
         if (names.isEmpty())
         {
-            activeLogger->warn("Snippets", "There are no snippets for " + lang.toStdString()
-                + ". Please add snippets in the preference window.");
+            activeLogger->warn("Snippets", "There are no snippets for " + lang.toStdString() +
+                                               ". Please add snippets in the preference window.");
         }
         else
         {
             auto ok = new bool;
-            auto name = QInputDialog::getItem(this, tr("Use Snippets"),
-                tr("Choose a snippet:"), names, 0, true, ok);
+            auto name = QInputDialog::getItem(this, tr("Use Snippets"), tr("Choose a snippet:"), names, 0, true, ok);
             if (*ok)
             {
-                auto content = settingManager->getSnippet(lang, name);
-                current->insertText(content);
+                if (names.contains(name))
+                {
+                    auto content = settingManager->getSnippet(lang, name);
+                    current->insertText(content);
+                }
+                else
+                {
+                    activeLogger->warn("Snippets", "There is no snippet named " + name.toStdString() + " for " +
+                                                       lang.toStdString());
+                }
             }
         }
     }