[Traverso-commit] traverso/src/traverso/dialogs MarkerDialog.cpp

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/04/10 20:18:30

Modified files:
        src/traverso/dialogs: MarkerDialog.cpp 

Log message:
        fixed crash bug 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/dialogs/MarkerDialog.cpp?cvsroot=traverso&r1=1.5&r2=1.6

Patches:
Index: MarkerDialog.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/dialogs/MarkerDialog.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- MarkerDialog.cpp    9 Apr 2007 14:16:20 -0000       1.5
+++ MarkerDialog.cpp    10 Apr 2007 20:18:30 -0000      1.6
@@ -54,6 +54,7 @@
        
        // hide the first column if necessary
        markersTreeWidget->header()->setSectionHidden(0, true);
+       markersTreeWidget->header()->resizeSection(1, 80);
 
        pushButtonRemove->setAutoDefault(false);
        pushButtonExport->setAutoDefault(false);
@@ -130,8 +131,16 @@
                return;
        }
 
-       int i = comboBoxDisplaySong->currentIndex();
-       Song *song = m_songlist.at(i);
+       int index = comboBoxDisplaySong->currentIndex();
+       if (index < 0) {
+               index = 0;
+       }
+       
+       if (index >= m_songlist.size()) {
+               index = m_songlist.size() - 1;
+       }
+       
+       Song* song = m_songlist.at(index);
 
        TimeLine* tl = song->get_timeline();
                
@@ -140,7 +149,7 @@
                QString pos = frame_to_smpte(marker->get_when(), 
m_project->get_rate());
 
                QTreeWidgetItem* item = new QTreeWidgetItem(markersTreeWidget);
-               item->setText(0, QString("%1 %2").arg(i, 2, 10, 
QLatin1Char('0')).arg(song->get_title()));
+               item->setText(0, QString("%1 %2").arg(index, 2, 10, 
QLatin1Char('0')).arg(song->get_title()));
                item->setText(1, pos.simplified());
                item->setText(2, name);
                item->setData(0, Qt::UserRole, marker->get_id());