Commit 0a68e201 authored by llea's avatar llea

More robustin case of non-existing config-file

parent c9edfb2e
/****************************************************************************
** Form implementation generated from reading ui file 'configurationpanel.ui'
**
** Created: Thu Jan 6 14:11:38 2005
** Created: Thu Jan 6 16:49:19 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
......
/****************************************************************************
** Form interface generated from reading ui file 'configurationpanel.ui'
**
** Created: Thu Jan 6 14:11:38 2005
** Created: Thu Jan 6 16:49:19 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
......
/****************************************************************************
** Form implementation generated from reading ui file 'phonebook.ui'
**
** Created: Thu Jan 6 14:11:37 2005
** Created: Thu Jan 6 16:49:18 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
......
/****************************************************************************
** Form interface generated from reading ui file 'phonebook.ui'
**
** Created: Thu Jan 6 14:11:37 2005
** Created: Thu Jan 6 16:49:18 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
......
......@@ -21,8 +21,12 @@
////////////////////////////////////////////////////////////////////////////////
// QtGUIMainWindow Implementation //
////////////////////////////////////////////////////////////////////////////////
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <qbitmap.h>
#include <qcheckbox.h>
......@@ -272,6 +276,7 @@ QtGUIMainWindow::QtGUIMainWindow (QWidget *parent, const char *name, WFlags f,
// Show the GUI
this->show();
// Handle the tray icon system
mypop = new QPopupMenu(this);
mypop->insertItem ("Quit", qApp, SLOT(quit()));
......
......@@ -223,19 +223,21 @@ ToneGenerator::toneHandle (int idr) {
int idz = idZoneName(Config::gets(QString(
"Preferences/Options.zoneToneChoice")));
buildTone (idz, idr, SAMPLING_RATE, AMPLITUDE, buf);
if (idz != -1) {
buildTone (idz, idr, SAMPLING_RATE, AMPLITUDE, buf);
// New thread for the tone
if (tonethread == NULL) {
tonethread = new ToneThread (manager, buf, totalbytes);
tonethread->start();
}
// New thread for the tone
if (tonethread == NULL) {
tonethread = new ToneThread (manager, buf, totalbytes);
tonethread->start();
}
if (!manager->tonezone) {
tonethread->join();
if (tonethread != NULL) {
delete tonethread;
tonethread = NULL;
if (!manager->tonezone) {
tonethread->join();
if (tonethread != NULL) {
delete tonethread;
tonethread = NULL;
}
}
}
}
......
/****************************************************************************
** Form implementation generated from reading ui file 'url_input.ui'
**
** Created: Thu Jan 6 14:11:38 2005
** Created: Thu Jan 6 16:49:19 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
......
/****************************************************************************
** Form interface generated from reading ui file 'url_input.ui'
**
** Created: Thu Jan 6 14:11:38 2005
** Created: Thu Jan 6 16:49:19 2005
** by: The User Interface Compiler ($Id$)
**
** WARNING! All changes made in this file will be lost!
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment