1 files changed, 3 insertions, 2 deletions
diff --git a/src/document.cpp b/src/document.cpp
index dda072283..b94b72bda 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -139,8 +139,6 @@ SPDocument::SPDocument() :
 }
 
 SPDocument::~SPDocument() {
-    collectOrphans();
-
     // kill/unhook this first
     if ( profileManager ) {
         delete profileManager;
@@ -224,6 +222,9 @@ SPDocument::~SPDocument() {
         delete this->current_persp3d_impl;
     this->current_persp3d_impl = NULL;
 
+    // This is at the end of the destructor, because preceding code adds new orphans to the queue
+    collectOrphans();
+
     //delete this->_whiteboard_session_manager;
 }