diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index be17908dd4..2c1a7c872c 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -439,9 +439,7 @@ void MainWindow::ConnectMenuBar() connect(m_menu_bar, &MenuBar::BootWiiSystemMenu, this, &MainWindow::BootWiiSystemMenu); connect(m_menu_bar, &MenuBar::StartNetPlay, this, &MainWindow::ShowNetPlaySetupDialog); connect(m_menu_bar, &MenuBar::ShowFIFOPlayer, this, &MainWindow::ShowFIFOPlayer); -#ifndef _WIN32 connect(m_menu_bar, &MenuBar::StartBbaServer, this, &MainWindow::StartBbaServer); -#endif connect(m_menu_bar, &MenuBar::ConnectWiiRemote, this, &MainWindow::OnConnectWiiRemote); // Movie @@ -1131,7 +1129,6 @@ void MainWindow::ShowFIFOPlayer() m_fifo_window->activateWindow(); } -#ifndef _WIN32 void MainWindow::StartBbaServer() { if (!m_bba_server_window) @@ -1141,7 +1138,6 @@ void MainWindow::StartBbaServer() m_bba_server_window->raise(); m_bba_server_window->activateWindow(); } -#endif void MainWindow::StateLoad() { diff --git a/Source/Core/DolphinQt/MainWindow.h b/Source/Core/DolphinQt/MainWindow.h index d6c34c368b..59d4d4a262 100644 --- a/Source/Core/DolphinQt/MainWindow.h +++ b/Source/Core/DolphinQt/MainWindow.h @@ -149,9 +149,7 @@ private: void ShowHotkeyDialog(); void ShowNetPlaySetupDialog(); void ShowFIFOPlayer(); -#ifndef _WIN32 void StartBbaServer(); -#endif void ShowMemcardManager(); void ShowResourcePackManager(); void ShowCheatsManager(); @@ -208,9 +206,7 @@ private: SettingsWindow* m_settings_window = nullptr; GraphicsWindow* m_graphics_window = nullptr; FIFOPlayerWindow* m_fifo_window = nullptr; -#ifndef _WIN32 BBAServerWindow* m_bba_server_window = nullptr; -#endif MappingWindow* m_hotkey_window = nullptr; HotkeyScheduler* m_hotkey_scheduler; diff --git a/Source/Core/DolphinQt/MenuBar.cpp b/Source/Core/DolphinQt/MenuBar.cpp index 7c5c12f172..340ab2f8f9 100644 --- a/Source/Core/DolphinQt/MenuBar.cpp +++ b/Source/Core/DolphinQt/MenuBar.cpp @@ -240,9 +240,7 @@ void MenuBar::AddToolsMenu() tools_menu->addAction(tr("Start &NetPlay..."), this, &MenuBar::StartNetPlay); tools_menu->addAction(tr("FIFO Player"), this, &MenuBar::ShowFIFOPlayer); -#ifndef _WIN32 tools_menu->addAction(tr("&Broadband Adapter Server"), this, &MenuBar::StartBbaServer); -#endif tools_menu->addSeparator(); // Label will be set by a NANDRefresh later diff --git a/Source/Core/DolphinQt/MenuBar.h b/Source/Core/DolphinQt/MenuBar.h index 978d0960be..9f3a955c63 100644 --- a/Source/Core/DolphinQt/MenuBar.h +++ b/Source/Core/DolphinQt/MenuBar.h @@ -62,7 +62,6 @@ signals: void FrameAdvance(); void Screenshot(); void StartNetPlay(); - void StartBbaServer(); void StateLoad(); void StateSave(); void StateLoadSlot(); @@ -81,6 +80,7 @@ signals: // Tools void ShowMemcardManager(); void BootGameCubeIPL(DiscIO::Region region); + void StartBbaServer(); void ShowFIFOPlayer(); void ShowAboutDialog(); void ShowCheatsManager();