Changeset 1819


Ignore:
Timestamp:
Nov 29, 2012 8:24:42 AM (7 years ago)
Author:
stefan
Message:

merge r1818 from stable/2.8

Location:
trunk/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc

  • trunk/Cbc/src/CbcSolver.cpp

    r1813 r1819  
    828828extern "C" {
    829829    static void signal_handler(int /*whichSignal*/) {
    830         if (currentBranchModel != NULL) {
    831             currentBranchModel->setMaximumNodes(0); // stop at next node
    832             currentBranchModel->setMaximumSeconds(0.0); // stop
     830        if (currentBranchModel != NULL)
    833831            currentBranchModel->sayEventHappened(); // say why stopped
    834         }
    835832        return;
    836833    }
Note: See TracChangeset for help on using the changeset viewer.