Make sure we reset the state when loading another trace file

fixes issue #41

diff --git a/common/trace_parser.cpp b/common/trace_parser.cpp
index a72857700ed40aef073eece9b21a75b6106c4c2b..2eff0cda90bda893c9bbcf64e68c8c23158deff3 100644 (file)
--- a/common/trace_parser.cpp
+++ b/common/trace_parser.cpp
@@ -148,6 +148,8 @@ void Parser::close(void) {
         }
     }
     bitmasks.clear();
+
+    next_call_no = 0;
 }
 
 

diff --git a/gui/apitrace.cpp b/gui/apitrace.cpp
index bc862097099c75c0d48ce1a093ba3aff70711866..edf98b9eb85e33985c1fb9be53151e67db2f6d51 100644 (file)
--- a/gui/apitrace.cpp
+++ b/gui/apitrace.cpp
@@ -148,10 +148,12 @@ void ApiTrace::setFileName(const QString &name)
 {
     if (m_fileName != name) {
         m_fileName = name;
+        m_tempFileName = QString();
 
         m_frames.clear();
         m_errors.clear();
         m_editedCalls.clear();
+        m_queuedErrors.clear();
         m_needsSaving = false;
         emit invalidated();
 

diff --git a/gui/traceloader.cpp b/gui/traceloader.cpp
index 0fee815ff6a811bbac9a58e9099453de6aa71fa5..cf9b37bb4f9485d292f854469e9daf3aa6733886 100644 (file)
--- a/gui/traceloader.cpp
+++ b/gui/traceloader.cpp
@@ -38,6 +38,16 @@ void TraceLoader::loadTrace(const QString &filename)
         loadHelpFile();
     }
 
+    if (!m_frameBookmarks.isEmpty()) {
+        qDeleteAll(m_signatures);
+        qDeleteAll(m_enumSignatures);
+        m_signatures.clear();
+        m_enumSignatures.clear();
+        m_frameBookmarks.clear();
+        m_createdFrames.clear();
+        m_parser.close();
+    }
+
     if (!m_parser.open(filename.toLatin1())) {
         qDebug() << "error: failed to open " << filename;
         return;
@@ -51,7 +61,6 @@ void TraceLoader::loadTrace(const QString &filename)
         //Load the entire file into memory
         parseTrace();
     }
-
     emit finishedParsing();
 }
 

diff --git a/gui/traceloader.h b/gui/traceloader.h
index 4b88ec605041527e2c9464e1aabbc9ee9cd484da..e950b0914bf73b0e81671ec1db4d58cb561d7b40 100644 (file)
--- a/gui/traceloader.h
+++ b/gui/traceloader.h
@@ -85,7 +85,6 @@ private:
 
 private:
     Trace::Parser m_parser;
-    QString m_fileName;
     ApiTrace::FrameMarker m_frameMarker;
 
     typedef QMap<int, FrameBookmark> FrameBookmarks;