From f3d4e2574e557c9eee246b60cc4fa4cc0bb92ced Mon Sep 17 00:00:00 2001
From: amartin <olpc@xo-00-CE-12.localdomain>
Date: Fri, 02 Nov 2007 19:05:32 +0000
Subject: merge

---
(limited to 'TamTamEdit.activity/Edit/MainWindow.py')

diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py
index 215f9a6..223b4d2 100644
--- a/TamTamEdit.activity/Edit/MainWindow.py
+++ b/TamTamEdit.activity/Edit/MainWindow.py
@@ -51,6 +51,7 @@ class MainWindow( gtk.EventBox ):
         self.csnd = new_csound_client()
         self.tooltips = gtk.Tooltips()
         self.activity = activity
+
         for i in [6,7,8,9,10]:
             self.csnd.setTrackVolume(100, i)
         self.trackCount = 6
@@ -102,7 +103,7 @@ class MainWindow( gtk.EventBox ):
             self.trackActive = [ 1 for i in range(Config.NUMBER_OF_TRACKS) ]
 
             self.pages_playing = []
-            self.journalCalled = True
+            self.journalCalled = False
 
             self.noteDB = NoteDB.NoteDB()
             TP.ProfileEnd("init_data")
@@ -383,7 +384,8 @@ class MainWindow( gtk.EventBox ):
         first = self.noteDB.addPage( -1, NoteDB.Page(4, instruments = instrumentsIds) )
         self.displayPage( first )
 
-        self.createNewTune( None )
+        if not self.journalCalled:
+            self.createNewTune( None )
 
         # Toolbar
         self._mainToolbar = mainToolbar(self.activity.toolbox, self)
--
cgit v0.9.1