Skip to content

Commit 3728986

Browse files
committed
Make rename button state more clear, allow TW when song playing
1 parent e083bad commit 3728986

1 file changed

Lines changed: 9 additions & 6 deletions

File tree

arm9/source/main.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@ GUI *gui;
244244
// </Main Screen>
245245

246246
// <Things that suddenly pop up>
247-
Typewriter *tw;
248-
MessageBox *mb;
247+
Typewriter *tw = NULL;
248+
MessageBox *mb = NULL;
249249
// </Things that suddenly pop up>
250250

251251
u16 *b1n, *b1d;
@@ -631,7 +631,8 @@ void handleSampleChange(const u16 newsample)
631631
buttonsmpnormalize->set_enabled(smp != NULL);
632632
cbsnapto0xing->set_enabled(smp != NULL);
633633
buttonsmpdraw->set_enabled(smp != NULL);
634-
634+
buttonrenameinst->set_enabled(inst != NULL);
635+
buttonrenamesample->set_enabled(smp != NULL);
635636
lbsamples->select(newsample);
636637

637638
if(smp == NULL)
@@ -1167,6 +1168,7 @@ void deleteTypewriter(void)
11671168
gui->unregisterOverlayWidget();
11681169
typewriter_active = false;
11691170
delete tw;
1171+
tw = NULL;
11701172
redrawSubScreen();
11711173
}
11721174

@@ -1499,6 +1501,9 @@ void handlePotPosChangeFromSong(u16 newpotpos)
14991501

15001502
// Update other GUI Elements
15011503
updateGuiToNewPattern(song->getPotEntry(state->potpos));
1504+
1505+
if (tw)
1506+
tw->pleaseDraw();
15021507
}
15031508

15041509
#ifdef MIDI
@@ -2452,9 +2457,7 @@ void handleTypewriterSongnameOk(void)
24522457

24532458
void showTypewriterForSongRename(void)
24542459
{
2455-
if(!state->playing || state->pause) {
2456-
showTypewriter("song name", song->getName(), handleTypewriterSongnameOk, clearTypewriterText, deleteTypewriter);
2457-
}
2460+
showTypewriter("song name", song->getName(), handleTypewriterSongnameOk, clearTypewriterText, deleteTypewriter);
24582461
}
24592462

24602463
void handleTypewriterSampleOk(void)

0 commit comments

Comments
 (0)