paoda
/
zba
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix(imgui): handle valid ROM titles which happen to be empty

This commit is contained in:
Rekai Nyangadzayi Musuka 2023-04-06 03:08:07 -05:00
parent 13f5e7a480
commit 3c619df3dc
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/imgui.zig
View File

@ -46,8 +46,10 @@ pub const State = struct {
pub fn init(allocator: Allocator, title_opt: ?*const [12]u8) !@This() { pub fn init(allocator: Allocator, title_opt: ?*const [12]u8) !@This() {
const history = try allocator.alloc(u32, histogram_len); const history = try allocator.alloc(u32, histogram_len);
const title: [12:0]u8 = if (title_opt) |t| t.* ++ [_:0]u8{} else "[No Title]\x00\x00".*; return .{
return .{ .title = title, .fps_hist = RingBuffer(u32).init(history) }; .title = handleTitle(title_opt),
.fps_hist = RingBuffer(u32).init(history),
};
} }
pub fn deinit(self: *@This(), allocator: Allocator) void { pub fn deinit(self: *@This(), allocator: Allocator) void {
@ -87,7 +89,7 @@ pub fn draw(state: *State, tex_id: GLuint, cpu: *Arm7tdmi) void {
break :blk; break :blk;
}; };
state.title = cpu.bus.pak.title ++ [_:0]u8{}; state.title = handleTitle(&cpu.bus.pak.title);
} }
} }
@ -428,3 +430,13 @@ const widgets = struct {
}.inner; }.inner;
} }
}; };
fn handleTitle(title_opt: ?*const [12]u8) [12:0]u8 {
if (title_opt == null) return "[N/A Title]\x00".*; // No ROM present
const title = title_opt.?;
// ROM Title is an empty string (ImGui hates these)
if (title[0] == '\x00') return "[No Title]\x00\x00".*;
return title.* ++ [_:0]u8{};
}