From ea471aeacc21a5586b55035a7df5bf7c9242aa82 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 18 Sep 2002 19:26:05 +0000 Subject: [PATCH] No chokey if we have no game object. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1712 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/parlor/game/GameController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/parlor/game/GameController.java b/src/java/com/threerings/parlor/game/GameController.java index 5daf19b5c..51dc864bb 100644 --- a/src/java/com/threerings/parlor/game/GameController.java +++ b/src/java/com/threerings/parlor/game/GameController.java @@ -1,5 +1,5 @@ // -// $Id: GameController.java,v 1.18 2002/08/14 19:07:53 mdb Exp $ +// $Id: GameController.java,v 1.19 2002/09/18 19:26:05 mdb Exp $ package com.threerings.parlor.game; @@ -138,7 +138,7 @@ public abstract class GameController extends PlaceController */ public int getRoundId () { - return _gobj.roundId; + return (_gobj == null) ? -1 : _gobj.roundId; } /**