From 7b3d5ea7a730370a6baa5131f6003b060f30ff5f Mon Sep 17 00:00:00 2001
From: xarkes <antide.petit@gmail.com>
Date: Thu, 12 Oct 2017 14:35:30 +0200
Subject: [PATCH] Fix graph double click

---
 src/cutter.cpp                        | 19 -------------------
 src/widgets/DisassemblerGraphView.cpp |  8 +++++++-
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/cutter.cpp b/src/cutter.cpp
index eeccf12e..ef625b8f 100644
--- a/src/cutter.cpp
+++ b/src/cutter.cpp
@@ -745,10 +745,6 @@ void CutterCore::getOpcodes()
     this->regs.removeLast();
 }
 
-
-
-
-
 void CutterCore::setSettings()
 {
     setConfig("scr.color", false);
@@ -807,8 +803,6 @@ void CutterCore::setSettings()
     cmd("ec graph.trufae rgb:4183D7");
 }
 
-
-
 QList<RVA> CutterCore::getSeekHistory()
 {
     CORE_LOCK();
@@ -836,7 +830,6 @@ QStringList CutterCore::getAsmPluginNames()
     return ret;
 }
 
-
 QStringList CutterCore::getAnalPluginNames()
 {
     CORE_LOCK();
@@ -852,8 +845,6 @@ QStringList CutterCore::getAnalPluginNames()
     return ret;
 }
 
-
-
 QStringList CutterCore::getProjectNames()
 {
     CORE_LOCK();
@@ -866,7 +857,6 @@ QStringList CutterCore::getProjectNames()
     return ret;
 }
 
-
 QList<RBinPluginDescription> CutterCore::getRBinPluginDescriptions(const QString &type)
 {
     QList<RBinPluginDescription> ret;
@@ -894,7 +884,6 @@ QList<RBinPluginDescription> CutterCore::getRBinPluginDescriptions(const QString
     return ret;
 }
 
-
 QList<FunctionDescription> CutterCore::getAllFunctions()
 {
     CORE_LOCK();
@@ -918,8 +907,6 @@ QList<FunctionDescription> CutterCore::getAllFunctions()
     return ret;
 }
 
-
-
 QList<ImportDescription> CutterCore::getAllImports()
 {
     CORE_LOCK();
@@ -945,7 +932,6 @@ QList<ImportDescription> CutterCore::getAllImports()
     return ret;
 }
 
-
 QList<ExportDescription> CutterCore::getAllExports()
 {
     CORE_LOCK();
@@ -972,7 +958,6 @@ QList<ExportDescription> CutterCore::getAllExports()
     return ret;
 }
 
-
 QList<SymbolDescription> CutterCore::getAllSymbols()
 {
     CORE_LOCK();
@@ -1063,7 +1048,6 @@ QList<RelocDescription> CutterCore::getAllRelocs()
     return ret;
 }
 
-
 QList<StringDescription> CutterCore::getAllStrings()
 {
     CORE_LOCK();
@@ -1085,7 +1069,6 @@ QList<StringDescription> CutterCore::getAllStrings()
     return ret;
 }
 
-
 QList<FlagspaceDescription> CutterCore::getAllFlagspaces()
 {
     CORE_LOCK();
@@ -1104,7 +1087,6 @@ QList<FlagspaceDescription> CutterCore::getAllFlagspaces()
     return ret;
 }
 
-
 QList<FlagDescription> CutterCore::getAllFlags(QString flagspace)
 {
     CORE_LOCK();
@@ -1130,7 +1112,6 @@ QList<FlagDescription> CutterCore::getAllFlags(QString flagspace)
     return ret;
 }
 
-
 QList<SectionDescription> CutterCore::getAllSections()
 {
     CORE_LOCK();
diff --git a/src/widgets/DisassemblerGraphView.cpp b/src/widgets/DisassemblerGraphView.cpp
index c9a134f2..c043c8de 100644
--- a/src/widgets/DisassemblerGraphView.cpp
+++ b/src/widgets/DisassemblerGraphView.cpp
@@ -734,7 +734,13 @@ void DisassemblerGraphView::mouseDoubleClickEvent(QMouseEvent* event)
     {
         duint instr = this->getInstrForMouseEvent(event);
         //DbgCmdExec(QString("graph dis.branchdest(%1), silent").arg(ToPtrString(instr)).toUtf8().constData());
-        CutterCore::getInstance()->seek(instr);
+        QList<XrefDescription> refs = CutterCore::getInstance()->getXRefs(instr, false, false);
+        if (refs.length()) {
+            CutterCore::getInstance()->seek(refs.at(0).to);
+        }
+        if (refs.length() > 1) {
+            qWarning() << "Too many references here. Weird behaviour expected.";
+        }
     }
 }