3 files changed, 40 insertions, 2 deletions

diff --git a/noncore/tools/remote/buttondialog.cpp b/noncore/tools/remote/buttondialog.cpp
index e7ff4b4..7479e85 100644
--- a/noncore/tools/remote/buttondialog.cpp
+++ b/noncore/tools/remote/buttondialog.cpp
@@ -85,32 +85,44 @@ QStringList ButtonDialog::getList()
 QString ButtonDialog::getLabel()
 {
         return label->text();
 }
 
 QStringList ButtonDialog::getRemotes()
 {
         const char write_buffer[] = "LIST\n";
         const char *readbuffer;
         int i, numlines;
         QStringList list;
 
         addr.sun_family=AF_UNIX;
         strcpy(addr.sun_path,"/dev/lircd");
 
         fd = socket(AF_UNIX, SOCK_STREAM, 0);
+        if(fd == -1)
+        {
+                QMessageBox *mb = new QMessageBox("Error!",
+                                                                                        "couldnt connect to socket",
+                                                                                        QMessageBox::NoIcon,
+                                                                                        QMessageBox::Ok,
+                                                                                        QMessageBox::NoButton,
+                                                                                        QMessageBox::NoButton);
+                mb->exec();
+                perror("ButtonDialog::GetRemotes");
+                return NULL;
+        }
 
         if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
         {
                 QMessageBox *mb = new QMessageBox("Error!",
                                                                                         "couldnt connect to socket",
                                                                                         QMessageBox::NoIcon,
                                                                                         QMessageBox::Ok,
                                                                                         QMessageBox::NoButton,
                                                                                         QMessageBox::NoButton);
                 mb->exec();
                 perror("ButtonDialog::GetRemotes");
                 return NULL;
         }
 
         write(fd, write_buffer, strlen(write_buffer));
 
@@ -145,32 +157,45 @@ QStringList ButtonDialog::getRemotes()
         std::close(fd);
         return list;
 }
 
 QStringList ButtonDialog::getButtons(const char *remoteName)
 {
         QString write_buffer = "LIST ";
         const char *readbuffer;
         int i, j, numlines;
         QStringList list;
         QString string;
 
         write_buffer += remoteName;
         write_buffer += '\n';
 
         fd = socket(AF_UNIX, SOCK_STREAM, 0);
+        if(fd == -1)
+        {
+                QMessageBox *mb = new QMessageBox("Error!",
+                                                                                        "couldnt connect to socket",
+                                                                                        QMessageBox::NoIcon,
+                                                                                        QMessageBox::Ok,
+                                                                                        QMessageBox::NoButton,
+                                                                                        QMessageBox::NoButton);
+                mb->exec();
+                perror("ButtonDialog::GetButtons");
+                return NULL;
+        }
+
 
         if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
         {
                 QMessageBox *mb = new QMessageBox("Error!",
                                                                                         "couldnt connect to socket",
                                                                                         QMessageBox::NoIcon,
                                                                                         QMessageBox::Ok,
                                                                                         QMessageBox::NoButton,
                                                                                         QMessageBox::NoButton);
                 mb->exec();
                 perror("ButtonDialog::GetButtons");
                 return NULL;
         }
 
         write(fd, write_buffer.latin1(), strlen(write_buffer) );
 
diff --git a/noncore/tools/remote/remotetab.cpp b/noncore/tools/remote/remotetab.cpp
index f3a8945..64b8ee4 100644
--- a/noncore/tools/remote/remotetab.cpp
+++ b/noncore/tools/remote/remotetab.cpp
@@ -38,42 +38,55 @@ RemoteTab::RemoteTab(QWidget *parent=0, const char *name=0):QWidget(parent,name)
         //vcrGroup->setMaximumHeight(45);
 
         layout->addSpacing(1);
 
         channelGroup = new ChannelGroup(this);
         //channelGroup->setMaximumHeight(91);
         layout->addWidget(channelGroup, 0, 0);
 
         this->setMaximumWidth(240);
 
         timeout = 0;
 
         addr.sun_family=AF_UNIX;
         strcpy(addr.sun_path,"/dev/lircd");
 }
 
-void RemoteTab::sendIR()
+int RemoteTab::sendIR()
 {
         const QObject *button = sender();
         QString string = cfg->readEntry(button->name());
         string+='\n';
         const char *write_buffer = string.latin1();
         const char *read_buffer;
         bool done=false;
 
         fd = socket(AF_UNIX, SOCK_STREAM, 0);
+        if(fd == -1)
+        {
+                QMessageBox *mb = new QMessageBox("Error!",
+                                                                                        "couldnt connect to socket",
+                                                                                        QMessageBox::NoIcon,
+                                                                                        QMessageBox::Ok,
+                                                                                        QMessageBox::NoButton,
+                                                                                        QMessageBox::NoButton);
+                mb->exec();
+                perror("RemoteTab::SendIR");
+                return NULL;
+        }
+
 
         if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
         {
                 QMessageBox *mb = new QMessageBox("Error!",
                                                                                         "couldnt connect to socket",
                                                                                         QMessageBox::NoIcon,
                                                                                         QMessageBox::Ok,
                                                                                         QMessageBox::NoButton,
                                                                                         QMessageBox::NoButton);
                 mb->exec();
                 perror("RemoteTab::SendIR");
         }
 
         printf("fd2: %d\n", fd);
         printf("%s", write_buffer);
 
diff --git a/noncore/tools/remote/remotetab.h b/noncore/tools/remote/remotetab.h
index 77a7318..38b58e9 100644
--- a/noncore/tools/remote/remotetab.h
+++ b/noncore/tools/remote/remotetab.h
@@ -37,28 +37,28 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "channelgroup.h"
 #include "vcrgroup.h"
 
 #define PACKET_SIZE 256
 #define TIMEOUT 3
 
 class RemoteTab : public QWidget
 {
         Q_OBJECT
 public:
         RemoteTab(QWidget *parent=0, const char *name=0);
         void setIRSocket(int newfd);
         const char *readPacket();
         void setConfig(Config *newCfg);
         void updateRemotesList();
 public slots:
-        void sendIR();
+        int sendIR();
         void remoteSelected(const QString &string);
 private:
         int fd;
         int timeout;
         struct sockaddr_un addr;
         Config *cfg;
         TopGroup *topGroup;
         DVDGroup *dvdGroup;
         VCRGroup *vcrGroup;
         ChannelGroup *channelGroup;
 };