- when setting the current document, the GL compiler must be told that a merge is necessary *before* setting the renderer's document as setDocument will call zoomToFit which renders the scene. this rendering must trigger a merge or ldforge crashes if a new document is created when a document is already open.

Sun, 27 Apr 2014 03:51:10 +0300

author
Santeri Piippo <crimsondusk64@gmail.com>
date
Sun, 27 Apr 2014 03:51:10 +0300
changeset 735
54c321f4d102
parent 734
cdce1cbaac7e
child 736
0446af72b2ee

- when setting the current document, the GL compiler must be told that a merge is necessary *before* setting the renderer's document as setDocument will call zoomToFit which renders the scene. this rendering must trigger a merge or ldforge crashes if a new document is created when a document is already open.

src/ldDocument.cc file | annotate | diff | comparison | revisions
--- a/src/ldDocument.cc	Thu Apr 24 02:08:53 2014 +0300
+++ b/src/ldDocument.cc	Sun Apr 27 03:51:10 2014 +0300
@@ -1399,8 +1399,8 @@
 		g_win->updateDocumentListItem (f);
 		g_win->buildObjList();
 		g_win->updateTitle();
+		g_win->R()->compiler()->needMerge();
 		g_win->R()->setDocument (f);
-		g_win->R()->compiler()->needMerge();
 		print ("Changed file to %1", f->getDisplayName());
 	}
 }

mercurial