summaryrefslogtreecommitdiff
path: root/src/citra/emu_window/emu_window_glfw.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/citra/emu_window/emu_window_glfw.cpp')
-rw-r--r--src/citra/emu_window/emu_window_glfw.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/citra/emu_window/emu_window_glfw.cpp b/src/citra/emu_window/emu_window_glfw.cpp
index 697bf4693..982619126 100644
--- a/src/citra/emu_window/emu_window_glfw.cpp
+++ b/src/citra/emu_window/emu_window_glfw.cpp
@@ -76,9 +76,9 @@ EmuWindow_GLFW::EmuWindow_GLFW() {
76 std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc); 76 std::string window_title = Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc);
77 m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth, 77 m_render_window = glfwCreateWindow(VideoCore::kScreenTopWidth,
78 (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight), 78 (VideoCore::kScreenTopHeight + VideoCore::kScreenBottomHeight),
79 window_title.c_str(), NULL, NULL); 79 window_title.c_str(), nullptr, nullptr);
80 80
81 if (m_render_window == NULL) { 81 if (m_render_window == nullptr) {
82 ERROR_LOG(GUI, "Failed to create GLFW window! Exiting..."); 82 ERROR_LOG(GUI, "Failed to create GLFW window! Exiting...");
83 exit(1); 83 exit(1);
84 } 84 }
@@ -123,7 +123,7 @@ void EmuWindow_GLFW::MakeCurrent() {
123 123
124/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread 124/// Releases (dunno if this is the "right" word) the GLFW context from the caller thread
125void EmuWindow_GLFW::DoneCurrent() { 125void EmuWindow_GLFW::DoneCurrent() {
126 glfwMakeContextCurrent(NULL); 126 glfwMakeContextCurrent(nullptr);
127} 127}
128 128
129void EmuWindow_GLFW::ReloadSetKeymaps() { 129void EmuWindow_GLFW::ReloadSetKeymaps() {