X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fqt-console%2Frelabel%2Frelabel.cpp;h=a7aff3381c3e5ccdefed7be1b91d1e6dcfa6e2a2;hb=7241631e031577e8267a366a2e700ef0d3db89e9;hp=1aadbd7d810818c1917615ad5a5a63d5d1e8548d;hpb=b87e302861e0c6989cb79d6b1cdd7a60ead31708;p=bacula%2Fbacula

diff --git a/bacula/src/qt-console/relabel/relabel.cpp b/bacula/src/qt-console/relabel/relabel.cpp
index 1aadbd7d81..a7aff3381c 100644
--- a/bacula/src/qt-console/relabel/relabel.cpp
+++ b/bacula/src/qt-console/relabel/relabel.cpp
@@ -45,7 +45,7 @@ relabelDialog::relabelDialog(Console *console, QString &fromVolume)
 {
    m_console = console;
    m_fromVolume = fromVolume;
-   m_console->notify(false);
+   m_conn = m_console->notifyOff();
    setupUi(this);
    storageCombo->addItems(console->storage_list);
    poolCombo->addItems(console->pool_list);
@@ -68,10 +68,10 @@ int relabelDialog::getDefs(QStringList &fieldlist)
 {
    QString job, client, fileset;
    QString query("");
-   query = "SELECT mediatype AS MediaType, pool.name AS PoolName"
-   " FROM media"
-   " LEFT OUTER JOIN pool ON media.poolid = pool.poolid"
-   " WHERE volumename = \'" + m_fromVolume  + "\'";
+   query = "SELECT MediaType AS MediaType, Pool.Name AS PoolName"
+   " FROM Media"
+   " LEFT OUTER JOIN Pool ON Media.PoolId = Pool.PoolId"
+   " WHERE VolumeName = \'" + m_fromVolume  + "\'";
    if (mainWin->m_sqlDebug) { Pmsg1(000, "query = %s\n", query.toUtf8().data()); }
    QStringList results;
    if (m_console->sql_cmd(query, results)) {
@@ -110,8 +110,8 @@ void relabelDialog::accept()
       Pmsg1(000, "sending command : %s\n",scmd.toUtf8().data());
    }
    m_console->write_dir(scmd.toUtf8().data());
-   m_console->displayToPrompt();
-   m_console->notify(true);
+   m_console->displayToPrompt(m_conn);
+   m_console->notify(m_conn, true);
    delete this;
    mainWin->resetFocus();
 }
@@ -119,7 +119,7 @@ void relabelDialog::accept()
 void relabelDialog::reject()
 {
    this->hide();
-   m_console->notify(true);
+   m_console->notify(m_conn, true);
    delete this;
    mainWin->resetFocus();
 }