From a17f38fb747e94cbcd8bb3f0fa69b1411f52b603 Mon Sep 17 00:00:00 2001 From: "Zheng, Lei" Date: Thu, 5 Dec 2019 09:12:17 +0800 Subject: [PATCH] Do not reserve memory when copy/paste objects through file --- src/Gui/MainWindow.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp index 81d762e0a1..0d94f0472a 100644 --- a/src/Gui/MainWindow.cpp +++ b/src/Gui/MainWindow.cpp @@ -1591,11 +1591,13 @@ QMimeData * MainWindow::createMimeDataFromSelection () const // if less than ~10 MB bool use_buffer=(memsize < 0xA00000); QByteArray res; - try { - res.reserve(memsize); - } - catch (const Base::MemoryException&) { - use_buffer = false; + if(use_buffer) { + try { + res.reserve(memsize); + } + catch (const std::bad_alloc &) { + use_buffer = false; + } } WaitCursor wc;