[svn-upgrade] Integrating new upstream version, teleschorsch (0.1.4)

diff --git a/ChangeLog b/ChangeLog
index 6701a3fa3a09cb7bc51752f65d81d53b7d9b2938..c627b16645f580647dc17db9b87bcb99b107944b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 ------------------------------------------------------------------------
+r442 | gregoa | 2007-03-09 00:35:45 +0100 (Fri, 09 Mar 2007) | 1 line
+Changed paths:
+   M /teleschorsch/trunk/teleschorschrc
+
+comment out m6/12.50
+------------------------------------------------------------------------
 r441 | gregoa | 2007-03-08 17:09:47 +0100 (Thu, 08 Mar 2007) | 1 line
 Changed paths:
    M /teleschorsch/trunk/qteleschorsch_fr.ts

diff --git a/main.cpp b/main.cpp
index d0f6e91f14094d38d5d40f9956b683ec1192c6af..88292b8e9a11ef24d724620935e808a79f5faf7b 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -220,7 +220,7 @@ void appendPlayerOffsetOption(const QString& player, QTime offset, QStringList&
        int offsetSec = zero.secsTo(offset);
        if (player.indexOf("vlc") != -1) arguments.append("--start-time");
        if (player.indexOf("gmplayer") != -1) {
-               arguments << "--cache" << "512"; // --cache 512 does not belong to this function but for now...
+               arguments << "-cache" << "512"; // -cache 512 does not belong to this function but for now...
                arguments << "-ss"; 
        }
        arguments << QString::number(offsetSec);
@@ -273,8 +273,9 @@ void MainDialog::updateLwChannels() {
 
 
 bool MainDialog::startAction() {
-       int row = lwChannels->currentRow();
-       if (row > 0) {
+       QListWidgetItem* selectedChannel = lwChannels->selectedItems().at(0);
+       int row = lwChannels->row(selectedChannel);
+       if (row > -1) {
                Channel channel = channelVec[row];
                QDate date = calDate->selectedDate();
                QString substUrl;