edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve autoupdater a bit

Browse source 
- Only ask for restart when we're ingame or unsaved changes in editor
- Otherwise restart directly
This commit is contained in:
def 2015-03-14 16:10:46 +01:00
parent b4336e4638
commit 8ae27f81b6
4 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/engine/client.h
View file

@ -178,6 +178,7 @@ public:
virtual void DemoSlice(const char *pDstPath) = 0; virtual void DemoSlice(const char *pDstPath) = 0;
virtual void RequestDDNetSrvList() = 0; virtual void RequestDDNetSrvList() = 0;
virtual bool EditorHasUnsavedData() = 0;
}; };
class IGameClient : public IInterface class IGameClient : public IInterface

3
src/engine/client/autoupdate.cpp
View file

@ -52,7 +52,10 @@ void CAutoUpdate::CompletionCallback(CFetchTask *pTask, void *pUser)
pUpdate->ReplaceClient(); pUpdate->ReplaceClient();
if(pUpdate->m_ServerUpdate) if(pUpdate->m_ServerUpdate)
pUpdate->ReplaceServer(); pUpdate->ReplaceServer();
if(pUpdate->m_pClient->State() == IClient::STATE_ONLINE || pUpdate->m_pClient->EditorHasUnsavedData())
pUpdate->m_State = NEED_RESTART; pUpdate->m_State = NEED_RESTART;
else
pUpdate->m_pClient->Restart();
} }
else if(pTask->State() == CFetchTask::STATE_ERROR) else if(pTask->State() == CFetchTask::STATE_ERROR)
pUpdate->m_State = FAIL; pUpdate->m_State = FAIL;

1
src/engine/client/client.h
View file

@ -362,5 +362,6 @@ public:
virtual void DemoSlice(const char *pDstPath); virtual void DemoSlice(const char *pDstPath);
void RequestDDNetSrvList(); void RequestDDNetSrvList();
bool EditorHasUnsavedData() { return m_pEditor->HasUnsavedData(); }
}; };
#endif #endif

4
src/game/client/components/menus_browser.cpp
View file

@ -1302,10 +1302,6 @@ void CMenus::RenderServerbrowser(CUIRect MainView)
str_format(aBuf, sizeof(aBuf), "DDNet Client updated!"); str_format(aBuf, sizeof(aBuf), "DDNet Client updated!");
TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f); TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
} }
//else if(State == IAutoUpdate::NEED_RESTART && !Initiated){
// str_format(aBuf, sizeof(aBuf), "DDNet Client needs to be restarted to complete update!");
// TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
//}
UI()->DoLabelScaled(&Button, aBuf, 14.0f, -1); UI()->DoLabelScaled(&Button, aBuf, 14.0f, -1);
TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f); TextRender()->TextColor(1.0f, 1.0f, 1.0f, 1.0f);