Merge d7f1051 into 04c5050

x64dbg · Dec 17, 2023 · 203a6a2 · 203a6a2
2 parents 04c5050 + d7f1051
commit 203a6a2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/gui/Src/Gui/MemoryMapView.cpp b/src/gui/Src/Gui/MemoryMapView.cpp
@@ -431,8 +431,10 @@ void MemoryMapView::refreshMapSlot()
     MEMMAP memoryMap = {};
     DbgMemMap(&memoryMap);
 
-    setRowCount(memoryMap.count);
+    duint currSelectedAddressRow = (duint)getCellUserdata(getInitialSelection(), ColAddress);
+    bool oldAddressFound = false;
 
+    setRowCount(memoryMap.count);
     auto strUser = tr("User");
     auto strSystem = tr("System");
 
@@ -444,6 +446,11 @@ void MemoryMapView::refreshMapSlot()
         setCellContent(i, ColAddress, ToPtrString((duint)mbi.BaseAddress));
         setCellUserdata(i, ColAddress, (duint)mbi.BaseAddress);
 
+        if((duint)mbi.BaseAddress == currSelectedAddressRow)
+        {
+            oldAddressFound = true;
+            currSelectedAddressRow = i;
+        }
         // Size
         setCellContent(i, ColSize, ToPtrString((duint)mbi.RegionSize));
         setCellUserdata(i, ColSize, (duint)mbi.RegionSize);
@@ -527,6 +534,13 @@ void MemoryMapView::refreshMapSlot()
     if(memoryMap.page != 0)
         BridgeFree(memoryMap.page);
     reloadData(); //refresh memory map
+
+    if(oldAddressFound && currSelectedAddressRow != prevSelectedRow)
+    {
+        setSingleSelection(currSelectedAddressRow);
+        prevSelectedRow = currSelectedAddressRow;
+    }
+
 }
 
 void MemoryMapView::stateChangedSlot(DBGSTATE state)

diff --git a/src/gui/Src/Gui/MemoryMapView.h b/src/gui/Src/Gui/MemoryMapView.h
@@ -106,4 +106,5 @@ public slots:
     QMenu* mPluginMenu;
 
     duint mCipBase;
+    int prevSelectedRow;
 };