diff options
| author | Stijn Buys <ingar@osirion.org> | 2012-03-19 21:03:47 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2012-03-19 21:03:47 +0000 |
| commit | c4cd091c43ade80033f41c1ceda5c9f51979dcbc (patch) | |
| tree | 91b7b73cda8847c571d7aeaa7c38cfb48ce0a860 /src/client | |
| parent | 3c66f020bbe244e85da8cd92208b69cdba83ab97 (diff) | |
Resolved a ModelView related segfault when opening the buy menu and a potental segfault in the inventory window.
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/buymenu.cc | 2 | ||||
| -rw-r--r-- | src/client/gamewindow.cc | 2 | ||||
| -rw-r--r-- | src/client/inventorywindow.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/client/buymenu.cc b/src/client/buymenu.cc index 6812bce..ae941f8 100644 --- a/src/client/buymenu.cc +++ b/src/client/buymenu.cc @@ -77,7 +77,7 @@ void BuyMenu::set_item(core::Info *info) { menu_infotext.clear(); menu_namelabel->set_text(0); - menu_modelview->set_modelname(0); + menu_modelview->clear(); menu_buybutton->hide(); menu_modelview->hide(); menu_msgtext->hide(); diff --git a/src/client/gamewindow.cc b/src/client/gamewindow.cc index a2693e1..929cfe4 100644 --- a/src/client/gamewindow.cc +++ b/src/client/gamewindow.cc @@ -196,7 +196,7 @@ void GameWindow::show_menu(const std::string & args) if (label.compare("buy") == 0) { // buy menu, single item - unsigned long id; + unsigned int id; if (argstr >> id) { // hide other menus diff --git a/src/client/inventorywindow.cc b/src/client/inventorywindow.cc index 0d78025..2b956c4 100644 --- a/src/client/inventorywindow.cc +++ b/src/client/inventorywindow.cc @@ -361,7 +361,7 @@ void InventoryWindow::set_info(const core::Info *info, const int amount) inventorywindow_ejectslider->hide(); if (!info) { - inventorywindow_modelview->set_modelname(0); + inventorywindow_modelview->clear(); inventorywindow_modeltitlelabel->set_text(""); inventorywindow_modelnamelabel->set_text(""); } else { |