From cea198b37350235b019e4804487cf9141358cfa6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michal=20Mal=C3=BD?= <madcatxster@devoid-pointer.net>
Date: Wed, 8 Jul 2015 17:48:06 +0200
Subject: [PATCH] Use proper MVC in removeAndEraseEffect() handler.

---
 mainwindow.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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);
-- 
2.43.5