From 8b611b7c69b50bf2f252903a849dd41ed685fece Mon Sep 17 00:00:00 2001
From: Arno <arno@disconnect.de>
Date: Thu, 30 Nov 2017 15:36:35 +0100
Subject: Improve indexing dialog

Show close button and disable/enable approriate buttons while reading
data.
---
 indexerwidget.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indexerwidget.cpp')

diff --git a/indexerwidget.cpp b/indexerwidget.cpp
index ae1bd68..db1818c 100644
--- a/indexerwidget.cpp
+++ b/indexerwidget.cpp
@@ -46,6 +46,7 @@ IndexerWidget::IndexerWidget(QWidget *parent) : QWidget(parent), mMax(0) {
     connect(mReader, &BeetReader::errorMsg, this, &IndexerWidget::addToError);
     connect(mReader, &BeetReader::totalCount, this, &IndexerWidget::setupProgress);
     connect(mReader, &BeetReader::progress, this, &IndexerWidget::progress);
+    connect(mReader, &BeetReader::indexingDone, this, &IndexerWidget::indexingDone);
 
     //main layout
     QVBoxLayout *mainLayout = new QVBoxLayout;
@@ -137,7 +138,7 @@ void BeetReader::run(){
         //fetch data from file
         TagLib::FileRef file(QString(s).toUtf8());
         if(file.isNull()){
-            QString fn = QString(s).toUtf8();
+            QString fn(s);
             if(!fn.isEmpty()){
                 QString error = QString(tr("IsNull: %1")).arg(fn);
                 emit errorMsg(error);
@@ -176,6 +177,7 @@ void BeetReader::run(){
     }
     emit progress(total);
     emit errorMsg(tr("Indexing done!"));
+    emit indexingDone();
 }
 
 void BeetReader::cancel(){
-- 
cgit v1.2.3-70-g09d2