Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix french assert.

Browse Source 
Fixes a possible ASSERT(!(need_new_run && !mYieldEngine &&
sub_state_r->run_state == run_state)).

When over all multiplex_impl functions and this is the only case that I
found where it could return without changing the state and without
calling either idle() or yield().
This commit is contained in:
Aleric Inglewood
2013-05-27 02:15:28 +02:00
parent a8880983c4
commit b6f6dfbe99
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/aistatemachine/aistatemachinethread.cpp
View File

@@ -101,7 +101,10 @@ void AIStateMachineThreadBase::multiplex_impl(state_type run_state)
break; break;
case wait_stopped: case wait_stopped:
if (!mThread->isStopped()) if (!mThread->isStopped())
{
yield();
break; break;
}
// We're done! // We're done!
// //
// We can only get here when AIThreadImpl::done called cont(), (very // We can only get here when AIThreadImpl::done called cont(), (very

1
indra/newview/statemachine/aifilepicker.cpp
View File

@@ -420,6 +420,7 @@ void AIFilePicker::multiplex_impl(state_type run_state)
// Store folder of first filename as context. // Store folder of first filename as context.
AIFilePicker::store_folder(mContext, getFolder()); AIFilePicker::store_folder(mContext, getFolder());
finish(); finish();
break;
} }
} }
} }