Skip to content
Permalink
Browse files

Revert "Fix erronous toast when performing a game restart."

This reverts commit 42391b8.
  • Loading branch information
Gillou68310
Gillou68310 committed Nov 4, 2015
1 parent f3e08fe commit 6588405c3615af70ac46c0f1d46dd3a50ba940bf
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/paulscode/android/mupen64plusae/jni/CoreInterface.java
@@ -295,6 +295,7 @@ public void run()
// Auto-load state if desired
if( !sIsRestarting)
{
Notifier.showToast( sActivity, R.string.toast_loadingSession );
addOnStateCallbackListener( new OnStateCallbackListener()
{
@Override
@@ -305,7 +306,6 @@ public void onStateCallback( int paramChanged, int newValue )
&& saveToLoad != null)
{
removeOnStateCallbackListener( this );
Notifier.showToast( sActivity, R.string.toast_loadingSession );
NativeExports.emuLoadFile( saveToLoad );
}
}

6 comments on commit 6588405

@Gillou68310

This comment has been minimized.

Copy link

@Gillou68310 Gillou68310 replied Nov 4, 2015

@fzurita this is causing the autosave to not being loaded and also leads to a crash when exiting. Reverting it for the moment.

@fzurita

This comment has been minimized.

Copy link
Member

@fzurita fzurita replied Nov 4, 2015

Interesting, moving the location of the toast message is causing those issues? I wonder if the callback is happening in another thread.

@fzurita

This comment has been minimized.

Copy link
Member

@fzurita fzurita replied Nov 4, 2015

My auto saves are still being loaded correctly when choosing the resume option. Under what circumstances are auto saves not loading correctly?

@Gillou68310

This comment has been minimized.

Copy link

@Gillou68310 Gillou68310 replied Nov 4, 2015

Just starting the app and resuming a game will produce the issue for me
Propably a race condition on my particular device.

@fzurita

This comment has been minimized.

Copy link
Member

@fzurita fzurita replied Nov 4, 2015

Ok, sounds that way. I really doubt that the toast message is the root cause. It sounds like we need to synchronize something. I think moving the toast until after the save is loaded will probably fix it for you since that will restore the old timing. It's not a good fix though.

@Gillou68310

This comment has been minimized.

Copy link

@Gillou68310 Gillou68310 replied Nov 4, 2015

I guess you're right, I always hated those toast btw :-P

Please sign in to comment.
You can’t perform that action at this time.