← Back to branch summary

~ps-jenkins/mediascanner2/trusty-proposed

« back to all changes in this revision

Viewing changes to src/daemon/scannerdaemon.cc

  • Committer: CI bot
  • Author(s): Jussi Pakkanen
  • Date: 2014-03-14 15:17:06 UTC
  • mfrom: (214.3.1 mediascanner)
  • Revision ID: ps-jenkins@lists.canonical.com-20140314151706-s2ctkahfyv4h61aw
Delay signal handling initialisation. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/daemon/scannerdaemon.cc
94
94
    unique_ptr<MediaStore> tmp(new MediaStore(MS_READ_WRITE, "/media/"));
95
95
    store = move(tmp);
96
96
    extractor.reset(new MetadataExtractor());
97
 
    setupSignals();
98
97
    setupMountWatcher();
99
98
    addMountedVolumes();
100
99
 
107
106
        addDir(videodir);
108
107
    // In case someone opened the db file before we could populate it.
109
108
    invalidator.invalidate();
 
109
    // This is at the end because the initial scan may take a while
 
110
    // and is not interruptible but we want the process to die if it
 
111
    // gets a SIGINT or the like.
 
112
    setupSignals();
110
113
}
111
114
 
112
115
ScannerDaemon::~ScannerDaemon() {