From a68fcb9fb0a64589dbfa2194bc5f61de9be15d75 Mon Sep 17 00:00:00 2001 From: Norbert Moutarde Date: Wed, 7 May 2014 21:39:06 +0200 Subject: [PATCH] fix mistake and added the ability to cancel when multiple choice --- mainwindow.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index c83f73a..fd9a45d 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -154,8 +154,9 @@ void MainWindow::action(const QString &a){ entry(c); } else if(b[0]==QString("a/b")){ - QString e=QInputDialog::getItem(this, QString("choice"), QString("On vous offre un choix."), c.split(QString("")), 0, 0); - action(e); + bool ok; + QString e=QInputDialog::getItem(this, QString("choice"), QString("On vous offre un choix."), c.split(QString("")), 0, 1, &ok); + if(ok)action(e); } else if(b[0]=="back"){ if(way.size()>=2){ @@ -165,7 +166,7 @@ void MainWindow::action(const QString &a){ } else if(b[0]=="run"){ for(int d=0; d<=a.count(QString("")); d++){ - action(b.split(QString(""))[d]); + action(c.split(QString(""))[d]); } } else if(b[0]=="setfile"){ -- 2.45.1