diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/vdbe.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/vdbe.c b/src/vdbe.c index 6c5735b77..f70870ca6 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -755,15 +755,12 @@ check_for_interrupt: ** a return code SQLITE_ABORT. */ if( db->xProgress!=0 && nVmStep>=nProgressLimit ){ - int prc; - prc = db->xProgress(db->pProgressArg); - if( prc!=0 ){ + assert( db->nProgressOps!=0 ); + nProgressLimit = nVmStep + db->nProgressOps - (nVmStep%db->nProgressOps); + if( db->xProgress(db->pProgressArg) ){ rc = SQLITE_INTERRUPT; goto vdbe_error_halt; } - if( db->xProgress!=0 ){ - nProgressLimit = nVmStep + db->nProgressOps - (nVmStep%db->nProgressOps); - } } #endif |