From b468d04a98b0c50a48f03b1601a577278280a5b7 Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Sat, 22 Jul 2006 03:26:25 +0000 Subject: [PATCH] added checks to avoid segfaults when closing the application git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@253 0778d3d1-df1d-0410-868b-ea421aaaa00d --- src/core/track_container.cpp | 5 ++++- src/lib/journalling_object.cpp | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/core/track_container.cpp b/src/core/track_container.cpp index d2141f88b..7cda666b9 100644 --- a/src/core/track_container.cpp +++ b/src/core/track_container.cpp @@ -248,7 +248,10 @@ void trackContainer::removeTrack( track * _track ) eng()->getMixer()->play(); realignTracks(); - eng()->getSongEditor()->setModified(); + if( eng()->getSongEditor() ) + { + eng()->getSongEditor()->setModified(); + } } } diff --git a/src/lib/journalling_object.cpp b/src/lib/journalling_object.cpp index 37944bd60..116d4b12c 100644 --- a/src/lib/journalling_object.cpp +++ b/src/lib/journalling_object.cpp @@ -58,7 +58,7 @@ journallingObject::journallingObject( engine * _engine ) : journallingObject::~journallingObject() { - if( eng() != NULL ) + if( eng() && eng()->getProjectJournal() ) { eng()->getProjectJournal()->freeID( id() ); }