Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed freezing issue when logging in from fullscreen #151

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file.
Empty file.
Empty file.
4 changes: 2 additions & 2 deletions Source/Core/Core/HW/EXI_DeviceSlippi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ CEXISlippi::CEXISlippi()

// Initialize local selections to empty
localSelections.Reset();

// Update user file and then listen for User
#ifndef IS_PLAYBACK
user->ListenForLogIn();
Expand Down Expand Up @@ -2030,11 +2029,12 @@ void CEXISlippi::logMessageFromGame(u8 *payload)

void CEXISlippi::handleLogInRequest()
{

bool logInRes = user->AttemptLogin();
if (!logInRes)
{
main_frame->LowerRenderWindow();
user->OpenLogInPage();
main_frame->LowerRenderWindow();
user->ListenForLogIn();
}
}
Expand Down
6 changes: 4 additions & 2 deletions Source/Core/DolphinWX/Dolphin.vcxproj.user
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<ShowAllFiles>false</ShowAllFiles>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LocalDebuggerCommandArguments>-d</LocalDebuggerCommandArguments>
<LocalDebuggerCommandArguments>
</LocalDebuggerCommandArguments>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleasePlayback|x64'">
<LocalDebuggerCommandArguments>-d</LocalDebuggerCommandArguments>
Expand All @@ -17,6 +18,7 @@
<LocalDebuggerCommandArguments>-i "C:/test.json"</LocalDebuggerCommandArguments>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LocalDebuggerCommandArguments>-d</LocalDebuggerCommandArguments>
<LocalDebuggerCommandArguments>
</LocalDebuggerCommandArguments>
</PropertyGroup>
</Project>