Fix running display commands

hluk · May 3, 2024 · 2cc33fb · 2cc33fb
1 parent 19c8846
commit 2cc33fb
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/src/gui/clipboardbrowserplaceholder.cpp b/src/gui/clipboardbrowserplaceholder.cpp
@@ -52,11 +52,16 @@ ClipboardBrowser *ClipboardBrowserPlaceholder::createBrowser()
              this, &ClipboardBrowserPlaceholder::restartExpiring);
 
     m_browser = c.release();
+
+    emit browserCreated(m_browser);
+    if (!m_browser)
+        return nullptr;
+
     setActiveWidget(m_browser);
 
     restartExpiring();
 
-    emit browserCreated(m_browser);
+    emit browserLoaded(m_browser);
     return m_browser;
 }
 

diff --git a/src/gui/clipboardbrowserplaceholder.h b/src/gui/clipboardbrowserplaceholder.h
@@ -57,6 +57,7 @@ class ClipboardBrowserPlaceholder final : public QWidget
 
 signals:
     void browserCreated(ClipboardBrowser *browser);
+    void browserLoaded(ClipboardBrowser *browser);
     void browserDestroyed();
 
 protected:

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -1240,7 +1240,10 @@ void MainWindow::onBrowserCreated(ClipboardBrowser *browser)
                         browser, topLeft.row(), bottomRight.row());
                     }
              } );
+}
 
+void MainWindow::onBrowserLoaded(ClipboardBrowser *browser)
+{
     if (isScriptOverridden(ScriptOverrides::OnItemsLoaded)) {
         runScript(
             QStringLiteral("onItemsLoaded()"),
@@ -1455,6 +1458,8 @@ ClipboardBrowserPlaceholder *MainWindow::createTab(const QString &name, TabNameM
         placeholder = new ClipboardBrowserPlaceholder(name, m_sharedData, this);
         connect( placeholder, &ClipboardBrowserPlaceholder::browserCreated,
                  this, &MainWindow::onBrowserCreated );
+        connect( placeholder, &ClipboardBrowserPlaceholder::browserLoaded,
+                 this, &MainWindow::onBrowserLoaded );
         connect( placeholder, &ClipboardBrowserPlaceholder::browserDestroyed,
                  this, [this, placeholder]() { onBrowserDestroyed(placeholder); } );
 

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
@@ -498,6 +498,7 @@ class MainWindow final : public QMainWindow
     void moveToBottom();
 
     void onBrowserCreated(ClipboardBrowser *browser);
+    void onBrowserLoaded(ClipboardBrowser *browser);
     void onBrowserDestroyed(ClipboardBrowserPlaceholder *placeholder);
 
     void onItemSelectionChanged(const ClipboardBrowser *browser);