mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-25 03:40:40 +00:00
Merge remote-tracking branch 'glorf/bugfix-4'
This commit is contained in:
commit
2cb7e1f3d5
@ -397,11 +397,24 @@ namespace MWGui
|
|||||||
|
|
||||||
void Console::setSelectedObject(const MWWorld::Ptr& object)
|
void Console::setSelectedObject(const MWWorld::Ptr& object)
|
||||||
{
|
{
|
||||||
mPtr = object;
|
if (!object.isEmpty())
|
||||||
if (!mPtr.isEmpty())
|
{
|
||||||
setTitle("#{sConsoleTitle} (" + mPtr.getCellRef().mRefID + ")");
|
if (object == mPtr)
|
||||||
|
{
|
||||||
|
setTitle("#{sConsoleTitle}");
|
||||||
|
mPtr=MWWorld::Ptr();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
setTitle("#{sConsoleTitle} (" + object.getCellRef().mRefID + ")");
|
||||||
|
mPtr = object;
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
setTitle("#{sConsoleTitle}");
|
setTitle("#{sConsoleTitle}");
|
||||||
|
mPtr = MWWorld::Ptr();
|
||||||
|
}
|
||||||
MyGUI::InputManager::getInstance().setKeyFocusWidget(command);
|
MyGUI::InputManager::getInstance().setKeyFocusWidget(command);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user