From: Michal Malý <madcatxster@devoid-pointer.net>
Date: Wed, 8 Jul 2015 15:48:06 +0000 (+0200)
Subject: Use proper MVC in removeAndEraseEffect() handler.
X-Git-Tag: 0.4a~2
X-Git-Url: https://gitweb.devoid-pointer.net/?a=commitdiff_plain;h=cea198b37350235b019e4804487cf9141358cfa6;p=FFBChecker.git

Use proper MVC in removeAndEraseEffect() handler.
---

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 07257f0..fa308a9 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -177,9 +177,19 @@ void MainWindow::onRefreshDevicesClicked()
 
 void MainWindow::onRemoveEffectClicked()
 {
+  int effectIdx;
+  bool ok;
+
   if (m_activeDevice == nullptr)
     return;
-  if (!m_activeDevice->removeAndEraseEffect(ui->cbox_effectSlots->currentIndex()))
+
+  effectIdx = ui->cbox_effectSlots->currentData(Qt::UserRole).toInt(&ok);
+  if (!ok) {
+    showErrorMsgBox(ErrorMessages::BAD_EFFECT_SLOT);
+    return;
+  }
+
+  if (!m_activeDevice->removeAndEraseEffect(effectIdx))
     showErrorMsgBox(ErrorMessages::CANT_REMOVE_EFFECT);
   else
     setEffectStatusText(FFBEffect::FFBEffectStatus::NOT_LOADED);