[ci release] Handle more error cases when copy to clipboard

variar · May 25, 2021 · b4df740 · b4df740
1 parent 24012d2
commit b4df740
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/ui/src/abstractlogview.cpp b/src/ui/src/abstractlogview.cpp
@@ -1043,8 +1043,8 @@ void AbstractLogView::copy()
         auto text = selection_.getSelectedText( logData_ );
         text.replace( QChar::Null, QChar::Space );
         clipboard->setText( text );
-    } catch ( const std::bad_alloc& ) {
-        LOG_ERROR << "not enough memory";
+    } catch ( std::exception& err ) {
+        LOG_ERROR << "failed to copy data to clipboard " << err.what();
     }
 }
 
@@ -1545,8 +1545,8 @@ void AbstractLogView::updateGlobalSelection()
         // Updating it only for "non-trivial" (range or portion) selections
         if ( !selection_.isSingleLine() )
             clipboard->setText( selection_.getSelectedText( logData_ ), QClipboard::Selection );
-    } catch ( const std::bad_alloc& ) {
-        LOG_ERROR << "not enough memory";
+    } catch ( std::exception& err ) {
+        LOG_ERROR << "failed to copy data to clipboard " << err.what();
     }
 }
 

diff --git a/src/ui/src/mainwindow.cpp b/src/ui/src/mainwindow.cpp
@@ -42,6 +42,7 @@
 
 #include <QNetworkReply>
 #include <cassert>
+#include <exception>
 #include <iostream>
 
 #include <cmath>
@@ -810,8 +811,8 @@ void MainWindow::copy()
             // Put it in the global selection as well (X11 only)
             clipboard->setText( text, QClipboard::Selection );
         }
-    } catch ( const std::bad_alloc& ) {
-        LOG_ERROR << "not enough memory";
+    } catch ( std::exception& err ) {
+        LOG_ERROR << "failed to copy data to clipboard " << err.what();
     }
 }