ToS: only load Xonotic ToS when actually needed

diff --git a/qcsrc/menu/xonotic/dialog_termsofservice.qc b/qcsrc/menu/xonotic/dialog_termsofservice.qc
index 39ffaa43c37eccb0832247d6fc121a41bb757bb0..0fec38a892fd3f5b2eef54802320c642c753e677 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_termsofservice.qc
+++ b/qcsrc/menu/xonotic/dialog_termsofservice.qc
@@ -86,7 +86,6 @@ void XonoticToSDialog_fill(entity me)
        me.TR(me);
        me.TR(me);
                me.TD(me, me.rows - 4, me.columns, me.textBox = makeXonoticTextBox());
-               me.loadXonoticToS(me);
 
        me.TR(me);
        me.gotoRC(me, me.rows - 1, 0);

diff --git a/qcsrc/menu/xonotic/mainwindow.qc b/qcsrc/menu/xonotic/mainwindow.qc
index 4aa974835a58da15959f2d79e5b7be34d9324e0d..f5d2aca98e8c622028ff506228b05af6b0a8305c 100644 (file)
--- a/qcsrc/menu/xonotic/mainwindow.qc
+++ b/qcsrc/menu/xonotic/mainwindow.qc
@@ -61,7 +61,10 @@ void MainWindow_draw(entity me)
 
        if (me.firstDraw) {
                if (me.ToSDialog.shouldShow())
+               {
+                       me.ToSDialog.loadXonoticToS(me.ToSDialog);
                        DialogOpenButton_Click_withCoords(NULL, me.ToSDialog, '0 0 0', eX * conwidth + eY * conheight);
+               }
                else if(me.firstRunDialog.shouldShow())
                        DialogOpenButton_Click_withCoords(NULL, me.firstRunDialog, '0 0 0', eX * conwidth + eY * conheight);