ldforge: comparison src/document.cc

-:10939452bf86
+:79b23e02dcf1
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 LDDocument::LDDocument()
-{	setImplicit (true);
+{	setBeingDeleted (false);
+	setImplicit (true);
 	setSavePosition (-1);
 	setListItem (null);
 	setHistory (new History);
 	m_History->setFile (this);
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 LDDocument::~LDDocument()
-{	// Clear everything from the model
+{	// Remove this file from the list of files. This MUST be done FIRST, otherwise
+	// a ton of other functions will think this file is still valid when it is not!
+	g_loadedFiles.removeOne (this);
+	setBeingDeleted (true);
+	m_History->setIgnoring (true);
+	// Clear everything from the model
 	for (LDObject* obj : getObjects())
 		obj->deleteSelf();
 	// Clear the cache as well
 	for (LDObject* obj : getCache())
 		obj->deleteSelf();
 	delete m_History;
-	// Remove this file from the list of files
-	g_loadedFiles.removeOne (this);
 	// If we just closed the current file, we need to set the current
 	// file as something else.
 	if (this == getCurrentDocument())
 	{	bool found = false;
 		if (!found)
 			newFile();
 	}
+	if (this == g_logoedStud)
+		g_logoedStud = null;
+	elif (this == g_logoedStud2)
+		g_logoedStud2 = null;
+	closeUnused();
 	g_win->updateDocumentList();
+	log ("Closed %1", getName());
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 LDDocument* findDocument (str name)
 // =============================================================================
 // -----------------------------------------------------------------------------
 void LDDocument::forgetObject (LDObject* obj)
 {	int idx = obj->getIndex();
+	obj->unselect();
 	assert (m_Objects[idx] == obj);
-	dlog ("id: %1, type: %2, code: %3", obj->getID(), obj->getType(), obj->raw());
-	getHistory()->add (new DelHistory (idx, obj));
+	if (!getHistory()->isIgnoring())
+		getHistory()->add (new DelHistory (idx, obj));
 	m_Objects.removeAt (idx);
 	obj->setFile (null);
 }
 // =============================================================================
 	{	str oldcode = getObject (idx)->raw();
 		str newcode = obj->raw();
 		*m_History << new EditHistory (idx, oldcode, newcode);
 	}
+	m_Objects[idx]->unselect();
+	m_Objects[idx]->setFile (null);
 	obj->setFile (this);
 	m_Objects[idx] = obj;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
-static QList<LDDocument*> getFilesUsed (LDDocument* node)
+static void getFilesUsed (LDDocument* node, QList<LDDocument*>& filesUsed)
-{	QList<LDDocument*> filesUsed;
+{	filesUsed << node;
 	for (LDObject* obj : node->getObjects())
 	{	if (obj->getType() != LDObject::Subfile)
 			continue;
 		LDSubfile* ref = static_cast<LDSubfile*> (obj);
 		filesUsed << ref->getFileInfo();
-		filesUsed << getFilesUsed (ref->getFileInfo());
+		getFilesUsed (ref->getFileInfo(), filesUsed);
 	}
-	return filesUsed;
 }
 // =============================================================================
 // Find out which files are unused and close them.
 // -----------------------------------------------------------------------------
+static bool g_closingUnusedFiles = false;
 void LDDocument::closeUnused()
-{	QList<LDDocument*> filesUsed = getFilesUsed (getCurrentDocument());
+{	// Don't go here more than once at a time, otherwise we risk double-deletions
+	if (g_closingUnusedFiles)
-	// Anything that's explicitly opened must not be closed
+		return;
+	QList<LDDocument*> filesUsed;
+	g_closingUnusedFiles = true;
+	// Anything that's explicitly opened must not be closed.
+	// Also do not close anything used by anything explicit
 	for (LDDocument* file : g_loadedFiles)
 		if (!file->isImplicit())
-			filesUsed << file;
+			getFilesUsed (file, filesUsed);
+	// Savor the logoed studs if we use them
+	if (gl_logostuds && g_logoedStud && g_logoedStud2)
+	{	getFilesUsed (g_logoedStud, filesUsed);
+		getFilesUsed (g_logoedStud2, filesUsed);
+	}
 	// Remove duplicated entries
 	removeDuplicates (filesUsed);
 	// Close all open files that aren't in filesUsed
 	for (LDDocument* file : g_loadedFiles)
-	{	bool isused = false;
+		if (!filesUsed.contains (file))
-		for (LDDocument* usedFile : filesUsed)
-		{	if (file == usedFile)
-			{	isused = true;
-				break;
-			}
-		}
-		if (!isused)
 			delete file;
-	}
+	g_closingUnusedFiles = false;
-	g_loadedFiles.clear();
-	g_loadedFiles << filesUsed;
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 LDObject* LDDocument::getObject (int pos) const
 QList<LDObject*> LDDocument::inlineContents (LDSubfile::InlineFlags flags)
 {	// Possibly substitute with logoed studs:
 	// stud.dat -> stud-logo.dat
 	// stud2.dat -> stud-logo2.dat
 	if (gl_logostuds && (flags & LDSubfile::RendererInline))
-	{	if (getName() == "stud.dat" && g_logoedStud)
+	{	// Ensure logoed studs are loaded first
+		loadLogoedStuds();
+		if (getName() == "stud.dat" && g_logoedStud)
 			return g_logoedStud->inlineContents (flags);
 		elif (getName() == "stud2.dat" && g_logoedStud2)
 			return g_logoedStud2->inlineContents (flags);
 	}
 		g_win->buildObjList();
 		g_win->updateTitle();
 		g_win->R()->setFile (f);
 		g_win->R()->resetAllAngles();
 		g_win->R()->repaint();
 		log ("Changed file to %1", f->getShortName());
 	}
 }
 // =============================================================================
 // a new file over it.
 // -----------------------------------------------------------------------------
 void LDDocument::closeInitialFile()
 {	if (
 		countExplicitFiles() == 2 &&
-		g_loadedFiles[0]->getName() == "" &&
+		g_loadedFiles[0]->getName().isEmpty() &&
+		g_loadedFiles[1]->getName().isEmpty() == false &&
 		!g_loadedFiles[0]->hasUnsavedChanges()
 	)
 		delete g_loadedFiles[0];
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void loadLogoedStuds()
-{	log ("Loading logoed studs...\n");
+{	if (g_logoedStud && g_logoedStud2)
+		return;
 	delete g_logoedStud;
 	delete g_logoedStud2;
 	g_logoedStud = openDocument ("stud-logo.dat", true);
 	g_logoedStud2 = openDocument ("stud2-logo.dat", true);
+	log (LDDocument::tr ("Logoed studs loaded.\n"));
 }
 // =============================================================================
 // -----------------------------------------------------------------------------
 void LDDocument::addToSelection (LDObject* obj) // [protected]

Mercurial > ldforge / file comparison

comparison: src/document.cc

src/document.cc