Leahnaya/cc3dsfs
1
0
Fork 0
mirror of https://github.com/Lorenzooone/cc3dsfs.git synced 2026-09-12 02:25:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix locking up while reconnecting - Version bump
Some checks failed
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linux32 flags:32 name:Linux GCC 32 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linux64 flags:64 name:Linux GCC x64 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linuxarm32 flags:arm32 name:Linux GCC ARM 32 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:linuxarm64 flags:arm64 name:Linux GCC ARM 64 os:ubuntu-latest]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:macos name:macOS Apple Silicon os:macos-14]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:win32 flags:-A Win32 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 Win32 os:windows-2022]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:win64 flags:-A x64 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 x64 os:windows-2022]) (push) Has been cancelled
Details
CD / ${{ matrix.platform.name }} ${{ matrix.config.name }} (map[flags:-DBUILD_SHARED_LIBS=FALSE name:Static], map[artifact_name:winarm64 flags:-A ARM64 -DCMAKE_PARALLEL_MSVC=TRUE name:Windows VS2022 ARM os:windows-2022]) (push) Has been cancelled
Details
CD / Create Pi Mono Setup (push) Has been cancelled
Details
CD / Publishing (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Lorenzooone
2025-12-07 02:52:02 +01:00
parent dc21e1babe
commit b93c1507aa
15 changed files with 167 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/WindowScreen_Menu.cpp
View File

@@ -912,6 +912,11 @@ void WindowScreen::setup_connection_menu(std::vector<CaptureDevice> *devices_lis
this->connection_menu->insert_data(devices_list);
}
void WindowScreen::setup_reconnection_menu(bool reset_data) {
// Skip the check here. It's special.
this->switch_to_menu(RECONNECT_MENU_TYPE, NULL, reset_data);
}
void WindowScreen::setup_main_menu(bool reset_data, bool skip_setup_check) {
if((!skip_setup_check) && (!this->can_setup_menu()))
return;
@@ -1515,12 +1520,13 @@ void WindowScreen::poll(bool do_everything) {
done = true;
continue;
}
if(this->loaded_menu != CONNECT_MENU_TYPE) {
if((this->loaded_menu != CONNECT_MENU_TYPE) && (this->loaded_menu != RECONNECT_MENU_TYPE)) {
if(this->main_poll(event_data))
continue;
}
if((this->loaded_menu == DEFAULT_MENU_TYPE) || (this->loaded_menu_ptr == NULL)) {
this->no_menu_poll(event_data);
if(this->loaded_menu != RECONNECT_MENU_TYPE)
this->no_menu_poll(event_data);
continue;
}
if(!this->loaded_menu_ptr->poll(event_data))
@@ -1533,6 +1539,8 @@ void WindowScreen::poll(bool do_everything) {
if(this->check_connection_menu_result() != CONNECTION_MENU_NO_ACTION)
done = true;
break;
case RECONNECT_MENU_TYPE:
break;
case MAIN_MENU_TYPE:
switch(this->main_menu->selected_index) {
case MAIN_MENU_OPEN:
@@ -2425,6 +2433,10 @@ void WindowScreen::end_connection_menu() {
this->setup_no_menu();
}
void WindowScreen::end_reconnection_menu() {
this->setup_no_menu();
}
void WindowScreen::update_ds_3ds_connection(bool changed_type) {
if(changed_type && (this->curr_menu == CROP_MENU_TYPE))
this->setup_no_menu();