# # # patch "src/monotone/MonotoneThread.cpp" # from [8c14873ed51b9d4e72834e62436c37db4879932c] # to [9c85698d374dc6be2652e2a5b43b9d030a997390] # # patch "src/view/InventoryView.cpp" # from [9c334189239f0c0c2f53223a709b45a02f22358a] # to [b138e484c4dfdc3e790bef5359f31620591fa151] # ============================================================ --- src/monotone/MonotoneThread.cpp 8c14873ed51b9d4e72834e62436c37db4879932c +++ src/monotone/MonotoneThread.cpp 9c85698d374dc6be2652e2a5b43b9d030a997390 @@ -236,7 +236,7 @@ void MonotoneThread::run() } process->setReadChannel(QProcess::StandardOutput); - L(QString("thread %1: process started").arg(threadNumber)); + D(QString("thread %1: process started").arg(threadNumber)); emit started(threadNumber); QByteArray buffer; @@ -303,7 +303,7 @@ void MonotoneThread::run() output.clear(); processingTask = true; - L(QString("thread %1: task %2 (%3) started").arg(threadNumber) + D(QString("thread %1: task %2 (%3) started").arg(threadNumber) .arg(task.getCommandNumber()).arg(QString(task.getEncodedInput()))); } @@ -372,7 +372,7 @@ void MonotoneThread::run() processingTask = false; - L(QString("thread %1: task %2 (%3) finished").arg(threadNumber) + D(QString("thread %1: task %2 (%3) finished").arg(threadNumber) .arg(task.getCommandNumber()).arg(QString(task.getEncodedInput()))); emit taskFinished(task); ============================================================ --- src/view/InventoryView.cpp 9c334189239f0c0c2f53223a709b45a02f22358a +++ src/view/InventoryView.cpp b138e484c4dfdc3e790bef5359f31620591fa151 @@ -640,7 +640,8 @@ void InventoryView::slotRefresh() // even more special case - select the first child of this (pseudo) root if (!sourceRoot.isValid()) { - sourceRoot = sourceRoot.child(0, 0); + QModelIndex firstItem = model()->index(0, 0, QModelIndex()); + sourceRoot = sourceIndex(firstItem); } // still not valid, i.e. filtered out?