From 88ac1cf81dfb482794aa5d23866c538b62347dee Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Fri, 3 Feb 2006 07:38:44 +0000 Subject: [PATCH] split CreateMenu --- stepmania/src/ScreenOptionsMemoryCard.cpp | 10 +++++++--- stepmania/src/ScreenOptionsMemoryCard.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/stepmania/src/ScreenOptionsMemoryCard.cpp b/stepmania/src/ScreenOptionsMemoryCard.cpp index 26f27778ff..bb0855a0f9 100644 --- a/stepmania/src/ScreenOptionsMemoryCard.cpp +++ b/stepmania/src/ScreenOptionsMemoryCard.cpp @@ -37,12 +37,10 @@ bool ScreenOptionsMemoryCard::UpdateCurrentUsbStorageDevices() return aOldDevices != m_CurrentUsbStorageDevices; } -void ScreenOptionsMemoryCard::BeginScreen() +void ScreenOptionsMemoryCard::CreateMenu() { vector vHands; - UpdateCurrentUsbStorageDevices(); - FOREACH_CONST( UsbStorageDevice, m_CurrentUsbStorageDevices, iter ) { // TODO: Make these string themable @@ -78,6 +76,12 @@ void ScreenOptionsMemoryCard::BeginScreen() } InitMenu( vHands ); +} + +void ScreenOptionsMemoryCard::BeginScreen() +{ + UpdateCurrentUsbStorageDevices(); + CreateMenu(); ScreenOptions::BeginScreen(); diff --git a/stepmania/src/ScreenOptionsMemoryCard.h b/stepmania/src/ScreenOptionsMemoryCard.h index a6096ecef1..3760569e41 100644 --- a/stepmania/src/ScreenOptionsMemoryCard.h +++ b/stepmania/src/ScreenOptionsMemoryCard.h @@ -20,6 +20,7 @@ private: void ProcessMenuStart( const InputEventPlus &input ); + void CreateMenu(); void SelectRowWithMemoryCard( const RString &sOsMountPoint ); bool UpdateCurrentUsbStorageDevices();