Skip to content

Commit 93ecbcc

Browse files
committed
fix current index bug
1 parent 19381f8 commit 93ecbcc

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

src/Model.cpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,20 +175,15 @@ bool Model::runUmu(const int id) {
175175
} else {
176176
path << QString("%1.TRLE").arg(id);
177177
}
178-
QString s = path.get();
179-
qDebug() << "Model: path.get() " << s;
180178

181179
fileManager.getExtraPathToExe(path, data.getType(id));
182180

183-
s = path.get();
184-
qDebug() << "Model: path.get() " << s;
185181

186-
187-
m_umuRunner.setWorkingDirectory(s);
182+
m_umuRunner.setWorkingDirectory(path.get());
183+
qDebug() << "Model: setWorkingDirectory:" << path.get();
188184

189185
path << ExecutableNames().data[data.getType(id)];
190-
s = path.get();
191-
qDebug() << "Model: path.get() " << s;
186+
qDebug() << "Model: ExecutableName:" << path.get();
192187

193188
m_umuRunner.insertArguments(QStringList() << path.get());
194189
m_umuRunner.run();

src/TombRaiderLinuxLauncher.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -644,11 +644,10 @@ void TombRaiderLinuxLauncher::workTick() {
644644
ui->progressBar->setValue(value + 1);
645645
qDebug() << ui->progressBar->value() << "%";
646646
if (ui->progressBar->value() >= 100) {
647-
QModelIndex current = ui->listViewLevels->currentIndex();
648-
if (current.isValid()) {
649-
qint64 id = levelListProxy->getLid(current);
650-
levelListModel->setInstalled(current);
651-
if (levelListProxy->getItemType(current)) {
647+
if (m_current.isValid()) {
648+
qint64 id = levelListProxy->getLid(m_current);
649+
levelListModel->setInstalled(m_current);
650+
if (levelListProxy->getItemType(m_current)) {
652651
settings.setValue(
653652
QString("installed/game%1").arg(id),
654653
"true");
@@ -699,9 +698,8 @@ void TombRaiderLinuxLauncher::UpdateLevelDone() {
699698
ui->stackedWidget->setCurrentWidget(
700699
ui->stackedWidget->findChild<QWidget*>("select"));
701700
} else if (m_loadingDoneGoTo == "info") {
702-
QModelIndex current = ui->listViewLevels->currentIndex();
703-
if (current.isValid()) {
704-
qint64 id = levelListProxy->getLid(current);
701+
if (m_current.isValid()) {
702+
qint64 id = levelListProxy->getLid(m_current);
705703
if (id != 0) {
706704
InfoData info = controller.getInfo(id);
707705
if (!(info.m_body == "" && info.m_imageList.size() == 0)) {

0 commit comments

Comments
 (0)