From 727ba4f2b1f20173e7a7f5ab6cb2910382785fe9 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 2 Feb 2016 00:18:34 +0100
Subject: LAB: Fix loading rules from room 0

Regression from cd3ebf687c0e783147723095056d72684eddd347.

This fixes bug #6997.
---
 engines/lab/processroom.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/lab/processroom.cpp')

diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index ecbfb4e2a7..44c8d65d7c 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -482,7 +482,7 @@ bool LabEngine::doActionRuleSub(int16 action, int16 roomNum, const CloseData *cl
 	if (closePtr) {
 		RuleList *rules = &(_rooms[_roomNum]._rules);
 
-		if (!rules && (roomNum == 0)) {
+		if (rules->empty() && (roomNum == 0)) {
 			_resource->readViews(roomNum);
 			rules = &(_rooms[roomNum]._rules);
 		}
@@ -530,7 +530,7 @@ bool LabEngine::doOperateRuleSub(int16 itemNum, int16 roomNum, const CloseData *
 		if (closePtr->_closeUpType > 0) {
 			RuleList *rules = &(_rooms[roomNum]._rules);
 
-			if (!rules && (roomNum == 0)) {
+			if (rules->empty() && (roomNum == 0)) {
 				_resource->readViews(roomNum);
 				rules = &(_rooms[roomNum]._rules);
 			}
-- 
cgit v1.2.3