archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 08:51:28 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #226 from O1L/master

Browse source 
Fixed issue #221.
This commit is contained in:
Alexandro Sánchez Bach 2014-05-14 14:49:49 +02:00
commit 5b252a8bad
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
rpcs3/Gui/FnIdGenerator.cpp
View file

@ -68,24 +68,23 @@ u32 FnIdGenerator::GenerateFnId(const std::string& func_name)
void FnIdGenerator::PrintId() void FnIdGenerator::PrintId()
{ {
const std::string temp; TextInputDialog dial(0, "", "Please input function name");
TextInputDialog dial(0, temp, "Please input function name");
if (dial.ShowModal() == wxID_OK) if (dial.ShowModal() == wxID_OK)
{ {
dial.GetResult(); const std::string& func_name = dial.GetResult();
if (func_name.length() == 0)
return;
const be_t<u32> result = GenerateFnId(func_name);
m_func_name.push_back(func_name);
m_func_id.push_back(result);
ConLog.Write("Function: %s, Id: 0x%08x ", func_name.c_str(), result);
UpdateInformation();
} }
const std::string& func_name = dial.GetResult(); return;
if (func_name.length() == 0)
return;
const be_t<u32> result = GenerateFnId(func_name);
m_func_name.push_back(func_name);
m_func_id.push_back(result);
ConLog.Write("Function: %s, Id: 0x%08x ", func_name.c_str(), result);
UpdateInformation();
} }
void FnIdGenerator::UpdateInformation() void FnIdGenerator::UpdateInformation()

2
rpcs3/Gui/FnIdGenerator.h
View file

@ -1,3 +1,5 @@
#pragma once
#include "TextInputDialog.h" #include "TextInputDialog.h"
#include "../Crypto/aes.h" #include "../Crypto/aes.h"
#include "../Crypto/sha1.h" #include "../Crypto/sha1.h"

2
rpcs3/Gui/FrameBase.h
View file

@ -25,7 +25,7 @@ protected:
Bind(wxEVT_CLOSE_WINDOW, &FrameBase::OnClose, this); Bind(wxEVT_CLOSE_WINDOW, &FrameBase::OnClose, this);
Bind(wxEVT_MOVE, &FrameBase::OnMove, this); Bind(wxEVT_MOVE, &FrameBase::OnMove, this);
Bind(wxEVT_SIZE, &FrameBase::OnSize, this); Bind(wxEVT_SIZE, &FrameBase::OnResize, this);
} }
~FrameBase() ~FrameBase()