Ticket #11163: mythbackend-noexit-init-error.patch

File mythbackend-noexit-init-error.patch, 1.6 KB (added by jcrews@…, 12 years ago)

  • mythtv/programs/mythbackend/main_helpers.cpp 

    diff --git a/mythtv/programs/mythbackend/main_helpers.cpp b/mythtv/programs/mythbackend/main_helpers.cpp
index bc9d698..04ff974 100644
    a b int run_backend(MythBackendCommandLineParser &cmdline) 
    656656    {
    657657        LOG(VB_GENERAL, LOG_CRIT,
    658658            "Backend exiting, MainServer initialization error.");
    659         delete mainServer;
    660         return exitCode;
     659        cleanup();
     660        return exitCode;
    661661    }
    662662
    663663    if (httpStatus && mainServer)

  • mythtv/programs/mythbackend/mainserver.cpp 

    diff --git a/mythtv/programs/mythbackend/mainserver.cpp b/mythtv/programs/mythbackend/mainserver.cpp
index b5e12e6..de79a9b 100644
    a b MainServer::MainServer(bool master, int port, 
    227227                       QMap<int, EncoderLink *> *tvList,
    228228                       Scheduler *sched, AutoExpire *expirer) :
    229229    encoderList(tvList), mythserver(NULL),
    230     masterFreeSpaceListUpdater((master) ? new FreeSpaceUpdater(*this) : NULL),
     230    masterFreeSpaceListUpdater(NULL),
    231231    masterServerReconnect(NULL),
    232232    masterServer(NULL), ismaster(master), threadPool("ProcessRequestPool"),
    233233    masterBackendOverride(false),
    … … MainServer::MainServer(bool master, int port, 
    323323    masterFreeSpaceList << "0";
    324324    masterFreeSpaceList << "0";
    325325    masterFreeSpaceList << "0";
     326   
     327    master ? masterFreeSpaceListUpdater = new FreeSpaceUpdater(*this) : NULL;
    326328    if (masterFreeSpaceListUpdater)
    327329    {
    328330        MThreadPool::globalInstance()->startReserved(