Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
===================================================================
diff -u -red04e2e75728d635ec5c4530bcebe69ab32d9cdb -r9cd6be516aa221a17b218c27819ed892cd60e35f
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb)
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp	(.../instructionsnav.jsp)	(revision 9cd6be516aa221a17b218c27819ed892cd60e35f)
@@ -19,12 +19,11 @@
 				//learner and author(preview mode) will mark the finish
 					if(${mode == "learner"} || ${mode == "author"}){
 					   var reqIDVar = new Date();
-					   //if auto run mode, the opener will be null. 
-					   if(window.parent.opener != null) 
-						    window.parent.opener.location.href="<c:url value="/learning/completeItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${param.itemUid}&reqID="+reqIDVar.getTime();
-					   else{
+					   if(${sessionMap.runAuto}){
 					  		//set complete flag and finish this activity as well.
 					        window.parent.location.href='<c:url value="/learning/finish.do?sessionMapID=${sessionMapID}&mode=${mode}&toolSessionID=${param.toolSessionID}&itemUid=${param.itemUid}"/>';
+					   }else{
+						    window.parent.opener.location.href="<c:url value="/learning/completeItem.do"/>?sessionMapID=${sessionMapID}&mode=${mode}&itemUid=${param.itemUid}&reqID="+reqIDVar.getTime();
 					   }
 					}
 				   if(window.parent.opener != null) {