MemoryViewer: Fixed writing to USB Gecko

CosmoCortney · Nov 22, 2024 · 782e34c · 782e34c
1 parent 465d4f2
commit 782e34c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/MungPlex/source/Connection/USBGecko.hpp b/MungPlex/source/Connection/USBGecko.hpp
@@ -124,7 +124,7 @@ namespace MungPlex
 			*reinterpret_cast<uint32_t*>(pokeAddrValPair.data()) = std::byteswap(pokeAddress);
 			*reinterpret_cast<dataType*>(&pokeAddrValPair[8 - sizeof(dataType)]) = pokeVal;
 
-			if constexpr (std::is_same_v<dataType, int8_t> || std::is_same_v<dataType, uint8_t>)
+			if constexpr (std::is_same_v<dataType, int8_t> || std::is_same_v<dataType, uint8_t> || std::is_same_v<dataType, char>)
 			{
 				if ((ftStatus = sendGeckoCommand(cmd_poke08)) != FT_OK)
 					return ftStatus;

diff --git a/MungPlex/source/MemoryViewer/MemoryViewer.cpp b/MungPlex/source/MemoryViewer/MemoryViewer.cpp
@@ -123,20 +123,20 @@ void MungPlex::MemoryViewer::drawHexEditor()
     {
         if (_validAddress)
         {
-            if(ProcessInformation::GetConsoleConnectionType() != ProcessInformation::CONSOLE)
+            if(ProcessInformation::GetProcessType() != ProcessInformation::CONSOLE)
                 _memEdit.DrawContents(_hexView.data(), _readSize, _viewAddress, ProcessInformation::GetHandle(), _readAddressEx, _rereorder);
             else
             {
                 switch (ProcessInformation::GetConsoleConnectionType())
                 {
                 case ProcessInformation::CON_USBGecko:
                 {
-                    static uint64_t byteWriteAddress = 0;
+                    static uint64_t byteWriteOffset = 0;
 
-                    if (_memEdit.DrawContents(_hexView.data(), _readSize, _viewAddress, NULL, nullptr, false, 0, &byteWriteAddress))
+                    if (_memEdit.DrawContents(_hexView.data(), _readSize, _viewAddress, NULL, nullptr, false, 0, &byteWriteOffset))
                     {
                         USBGecko* gecko = ProcessInformation::GetUsbGecko();
-                        gecko->Poke<char>(_hexView[byteWriteAddress - _viewAddress], byteWriteAddress);
+                        gecko->Poke<char>(_hexView[byteWriteOffset], byteWriteOffset + _viewAddress);
                         refreshMemory();
                     }
                 } break;