i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mark the 2048 block size menu item as default

Browse Source 
* don't access invalid memory at the end of Go()


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23583 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-01-17 12:03:11 +00:00
parent 7d59553ec8
commit dccabf3cc9
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/drivesetup/InitParamsPanel.cpp
+9 -3
View File
@@ -88,7 +88,8 @@ InitParamsPanel::InitParamsPanel(BWindow* window)
blocksizeMenu->AddItem(new BMenuItem("1024 (Mostly small files)", message)); blocksizeMenu->AddItem(new BMenuItem("1024 (Mostly small files)", message));
message = new BMessage(MSG_BLOCK_SIZE); message = new BMessage(MSG_BLOCK_SIZE);
message->AddString("size", "2048"); message->AddString("size", "2048");
blocksizeMenu->AddItem(new BMenuItem("2048 (Recommended)", message)); BMenuItem* defaultItem = new BMenuItem("2048 (Recommended)", message);
blocksizeMenu->AddItem(defaultItem);
message = new BMessage(MSG_BLOCK_SIZE); message = new BMessage(MSG_BLOCK_SIZE);
message->AddString("size", "4096"); message->AddString("size", "4096");
blocksizeMenu->AddItem(new BMenuItem("4096", message)); blocksizeMenu->AddItem(new BMenuItem("4096", message));
@@ -97,6 +98,7 @@ InitParamsPanel::InitParamsPanel(BWindow* window)
blocksizeMenu->AddItem(new BMenuItem("8192 (Mostly large files)", message)); blocksizeMenu->AddItem(new BMenuItem("8192 (Mostly large files)", message));
fBlockSizeMF = new BMenuField("Blocksize", blocksizeMenu, NULL); fBlockSizeMF = new BMenuField("Blocksize", blocksizeMenu, NULL);
defaultItem->SetMarked(true);
BButton* okButton = new BButton("Initialize", new BMessage(MSG_OK)); BButton* okButton = new BButton("Initialize", new BMessage(MSG_OK));
BButton* cancelButton = new BButton("Cancel", new BMessage(MSG_CANCEL)); BButton* cancelButton = new BButton("Cancel", new BMessage(MSG_CANCEL));
@@ -201,7 +203,7 @@ InitParamsPanel::Go(BString& name, BString& parameters)
Show(); Show();
Unlock(); Unlock();
// block this thread now // block this thread now, but keep the window repainting
while (true) { while (true) {
status_t err = acquire_sem_etc(fExitSemaphore, 1, status_t err = acquire_sem_etc(fExitSemaphore, 1,
B_CAN_INTERRUPT | B_RELATIVE_TIMEOUT, 50000); B_CAN_INTERRUPT | B_RELATIVE_TIMEOUT, 50000);
@@ -226,8 +228,12 @@ InitParamsPanel::Go(BString& name, BString& parameters)
} }
} }
int32 value = fReturnValue;
Quit(); Quit();
return fReturnValue; // NOTE: this object is toast now!
return value;
} }