X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2FMainwindow.cxx;h=adadc0686a9a600d70f99b2e85dc9aae523a2499;hp=7ea9012bf9ed8fe45e3dd4578234d59160d48237;hb=1b43b26ba9b23cb5f3004db7b9b00f6b08227563;hpb=77a6f2a3b9389e806cff6777098cf901bef4bf46

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 7ea9012..adadc06 100644
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -56,11 +56,13 @@ Mainwindow::Mainwindow(InformationManager* mgr)
 	connect(guileLoad, &QAction::triggered,
 	        [&]() {
 		        QString fileName = QFileDialog::getOpenFileName(this, tr("Open Script"), "",
-		                                                        tr("Binaries") + " (*." +
+		                                                        tr("Scripts") + " (*." +
 		                                                        manager->getInterpreter("GUILE")->fileExtension().c_str() + ")");
-		        std::stringstream a, b;
-		        std::string c;
-		        manager->getInterpreter("GUILE")->loadFile(fileName.toStdString(), a, b, c);
+		        if(! fileName.isNull()) {
+			        std::stringstream a, b;
+			        std::string c;
+			        manager->getInterpreter("GUILE")->loadFile(fileName.toStdString(), a, b, c);
+		        }
 	        });
 
 	listWidget = new QTreeWidget();
@@ -88,21 +90,23 @@ Mainwindow::Mainwindow(InformationManager* mgr)
 	QTreeWidgetItem * external = new QTreeWidgetItem(listWidget, QStringList("External Functions"));
 	external->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator);
 	external->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd)));
-	mgr->registerNewFunctionEvent([=] (NewFunctionEvent* event) {
-			std::string name = event->function->getName();
-			if (event->function->isDynamic()) {
-				auto item = new QTreeWidgetItem(external, QStringList(name.c_str()));
-				item->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd)));
-			} else {
-				addFunction(event->function);
-			}
-		});
-	mgr->registerRenameFunctionEvent([&](RenameFunctionEvent* event) {
-			if (objects_list_by_address.find(event->address) == objects_list_by_address.end())
-				return;
-			auto item = objects_list_by_address[event->address];
-			if (item) item->setText(0, event->new_name.c_str());
-		});
+	connect(mgr, &InformationManager::newFunctionEvent,
+	        [=] (NewFunctionEvent* event) {
+		        std::string name = event->function->getName();
+		        if (event->function->isDynamic()) {
+			        auto item = new QTreeWidgetItem(external, QStringList(name.c_str()));
+			        item->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd)));
+		        } else {
+			        addFunction(event->function);
+		        }
+	        });
+	connect(mgr, &InformationManager::renameFunctionEvent,
+	        [&](RenameFunctionEvent* event) {
+		        if (objects_list_by_address.find(event->address) == objects_list_by_address.end())
+			        return;
+		        auto item = objects_list_by_address[event->address];
+		        if (item) item->setText(0, event->new_name.c_str());
+	        });
 	setGlobalHotkeys();
 }