From b7c5fa84e15277443efa4cd82d0fb54921197367 Mon Sep 17 00:00:00 2001 From: zeromus Date: Thu, 2 Jul 2015 16:40:05 -0500 Subject: [PATCH] add specified cue flags to existing data flag, don't overwrite it --- BizHawk.Emulation.DiscSystem/CUE/CUE_Compile.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/BizHawk.Emulation.DiscSystem/CUE/CUE_Compile.cs b/BizHawk.Emulation.DiscSystem/CUE/CUE_Compile.cs index bc228d0e83..811e471b0c 100644 --- a/BizHawk.Emulation.DiscSystem/CUE/CUE_Compile.cs +++ b/BizHawk.Emulation.DiscSystem/CUE/CUE_Compile.cs @@ -435,8 +435,9 @@ namespace BizHawk.Emulation.DiscSystem { if (curr_track == null) Warn("Ignoring invalid flag commands outside of a track command"); - else - curr_track.Flags = (cmd as CueFile.Command.FLAGS).Flags; + else + //take care to |= it here, so the data flag doesn't get cleared + curr_track.Flags |= (cmd as CueFile.Command.FLAGS).Flags; } if (cmd is CueFile.Command.TRACK)