1
0
Fork 0

GUI: resolved issue #433 (freeze when dropping a program in x64dbg)

This commit is contained in:
mrexodia 2015-11-21 04:16:36 +01:00
parent 5e9a33022b
commit dc8278d16b
3 changed files with 5 additions and 15 deletions

View File

@ -47,7 +47,7 @@ Disassembly::Disassembly(QWidget* parent) : AbstractTableView(parent)
// Slots
connect(Bridge::getBridge(), SIGNAL(repaintGui()), this, SLOT(reloadData()));
connect(Bridge::getBridge(), SIGNAL(updateDump()), this, SLOT(reloadData()));
connect(Bridge::getBridge(), SIGNAL(dbgStateChanged(DBGSTATE)), this, SLOT(debugStateChanged(DBGSTATE)));
connect(Bridge::getBridge(), SIGNAL(dbgStateChanged(DBGSTATE)), this, SLOT(debugStateChangedSlot(DBGSTATE)));
Initialize();
}

View File

@ -562,7 +562,7 @@ void MainWindow::openFile()
{
filename = fileToOpen->text();
}
DbgCmdExec(QString("init \"" + filename + "\"").toUtf8().constData());
DbgCmdExec(QString().sprintf("init \"%s\"", filename.toUtf8().constData()).toUtf8().constData());
//file is from recent menu
if(fileToOpen != NULL && fileToOpen->objectName().startsWith("MRU"))
@ -612,16 +612,9 @@ void MainWindow::startScylla() //this is executed
void MainWindow::restartDebugging()
{
char filename[MAX_SETTING_SIZE] = "";
if(!mMRUList.size())
return;
strcpy_s(filename, mMRUList.at(0).toUtf8().constData());
if(DbgIsDebugging())
{
DbgCmdExec("stop"); //close current file (when present)
Sleep(400);
}
DbgCmdExec(QString().sprintf("init \"%s\"", filename).toUtf8().constData());
DbgCmdExec(QString().sprintf("init \"%s\"", mMRUList.at(0).toUtf8().constData()).toUtf8().constData());
mCpuWidget->setDisasmFocus();
}
@ -644,10 +637,7 @@ void MainWindow::dropEvent(QDropEvent* pEvent)
if(pEvent->mimeData()->hasUrls())
{
QString filename = QDir::toNativeSeparators(pEvent->mimeData()->urls()[0].toLocalFile());
if(DbgIsDebugging())
DbgCmdExecDirect("stop");
QString cmd;
DbgCmdExec(cmd.sprintf("init \"%s\"", filename.toUtf8().constData()).toUtf8().constData());
DbgCmdExec(QString().sprintf("init \"%s\"", filename.toUtf8().constData()).toUtf8().constData());
pEvent->acceptProposedAction();
}
}

View File

@ -94,8 +94,8 @@
<addaction name="actionDonate"/>
<addaction name="actionReportBug"/>
<addaction name="separator"/>
<addaction name="actionAbout"/>
<addaction name="actionManual"/>
<addaction name="actionAbout"/>
</widget>
<widget class="QMenu" name="menuPlugins">
<property name="title">