From 0acd37a328bbc046f6adafab0f49edd2a91ac676 Mon Sep 17 00:00:00 2001
From: Raul Tambre <raul.tambre@gmail.com>
Date: Wed, 8 Jul 2015 19:16:18 +0300
Subject: [PATCH] Make icon show on actual window

---
 rpcs3/Gui/MainFrame.cpp |   1 +
 rpcs3/rpcs3.rc          | Bin 282 -> 320 bytes
 2 files changed, 1 insertion(+)

diff --git a/rpcs3/Gui/MainFrame.cpp b/rpcs3/Gui/MainFrame.cpp
index 924647c1c8..60a2aee262 100644
--- a/rpcs3/Gui/MainFrame.cpp
+++ b/rpcs3/Gui/MainFrame.cpp
@@ -120,6 +120,7 @@ MainFrame::MainFrame()
 	menu_help->Append(id_help_about, "&About...");
 
 	SetMenuBar(menubar);
+	SetIcon(wxICON(frame_icon));
 
 	// Panels
 	m_log_frame = new LogFrame(this);
diff --git a/rpcs3/rpcs3.rc b/rpcs3/rpcs3.rc
index 12019ebba9b169ad949ff26add6d0d4883fddfe8..232701db8ed41b99f7899128b3b270e94d9848b9 100644
GIT binary patch
delta 80
zcmbQmbbx8Xf{8^U;^hn#4EhYY48;uPKpMo;V<=)so;XvQ-IKwY!Jolz;$K<WG@w`_
XP*o~JJVPc!GDAK?9)kh{T!AD2Kh+bH

delta 86
kcmX@WG>d7%f{B+zJQWylLr(^027d-WJSvd%PJAm106F^$GXMYp