From dbeaede5670c43c5b42d08cc1ce784b35f470541 Mon Sep 17 00:00:00 2001 From: zeromus Date: Mon, 9 Jun 2014 03:13:59 +0000 Subject: [PATCH] fix yabause+gl crashes (loadstate can trigger GL work, context needed setting ahead of time) --- BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs index 7244319e83..96f8f7cd89 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/Saturn/Yabause.cs @@ -371,7 +371,14 @@ namespace BizHawk.Emulation.Cores.Sega.Saturn { var fp = new FilePiping(); fp.Offer(data); + + //loadstate can trigger GL work + CoreComm.ActivateGLContext(glContext); + bool succeed = LibYabause.libyabause_loadstate(fp.GetPipeNameNative()); + + CoreComm.DeactivateGLContext(); + fp.Finish(); if (!succeed) throw new Exception("libyabause_loadstate() failed");