← Back to branch summary

~ubuntu-branches/ubuntu/raring/mumble/raring

« back to all changes in this revision

Viewing changes to src/mumble/os_macx.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Thorvald Natvig
  • Date: 2010-01-09 19:28:50 UTC
  • mfrom: (9.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100109192850-zs4g5vwrrpd71kob
Tags: 1.2.1-2
Fix upgrade failure when upgrading mumble-server directly from 1.1.x
to 1.2.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mumble/os_macx.cpp
1
 
/* Copyright (C) 2005-2009, Thorvald Natvig <thorvald@natvig.com>
 
1
/* Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
2
2
   Copyright (C) 2008-2009, Mikkel Krautz <mikkel@krautz.dk>
3
3
 
4
4
   All rights reserved.
161
161
}
162
162
 
163
163
static void crashhandler_init() {
 
164
#ifdef COMPAT_CLIENT
 
165
        QString dump = QDir::homePath() + QLatin1String("/Library/Preferences/Mumble/mumble11x.dmp");
 
166
#else
164
167
        QString dump = g.qdBasePath.filePath(QLatin1String("mumble.dmp"));
 
168
#endif
165
169
        if (strncpy(crashhandler_fn, dump.toUtf8().data(), PATH_MAX)) {
166
170
                crashhandler_signals_setup();
167
171
                /* todo: Change the behavior of the Apple crash dialog? Maybe? */
179
183
        crashhandler_init();
180
184
 
181
185
        const char *home = getenv("HOME");
 
186
#ifdef COMPAT_CLIENT
 
187
        const char *logpath = "/Library/Logs/Mumble11x.log";
 
188
#else
182
189
        const char *logpath = "/Library/Logs/Mumble.log";
 
190
#endif
183
191
 
184
192
        if (home) {
185
193
                size_t len = strlen(home) + strlen(logpath) + 1;