Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_multiplayer_media_demo.qc

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc
index 6ba33e2a710128ce86bb03c1369ea84883901771..66019c4bf41a6958f144cc01ffa340403488cb8f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qc
@@ -10,7 +10,7 @@ const float DMO_PLAY = 1;
 const float DMO_TIME = 2;
 void DemoConfirm_Check_Gamestatus(entity btn, entity me)
 {
-       if(!(gamestatus & (GAME_CONNECTED | GAME_ISSERVER))) // we're not in a match, lets watch the demo
+       if(!(gamestatus & (GAME_CONNECTED | GAME_ISSERVER)) || isdemo()) // we're not in a match, lets watch the demo
        {
                if(btn.democlicktype == DMO_PLAY)
                        { demolist.startDemo(demolist); }