# HG changeset patch # User Alexis Jeandet # Date 2016-07-04 15:32:17 # Node ID f5779f536b0ff929d2e15b0214fa680202e1339c # Parent bb586b1394df539db0972aab404c70f6ae2133e9 Fixed test order, on RegsExplorer::addDev, must check pointer before members. diff --git a/.hgsubstate b/.hgsubstate --- a/.hgsubstate +++ b/.hgsubstate @@ -1,4 +1,4 @@ 1cb664ab4bb3c531d706b1948a378ed9810c0dda src/SocExplorerEngine/PeripheralWidget -1f143e4ae72a0bb4832b546eb76eb50e94049b80 src/common/genericBinaryFiles +eee9d5c97f55f377210426c1688224e9adc3dd8d src/common/genericBinaryFiles 2b353bf8243cbfb3db44e196f33bd164c11c9949 src/common/lppserial 923afde9cc96bb419cf898560d080ec96991aeca src/common/qhexedit diff --git a/src/regsExplorer/regsexplorer.cpp b/src/regsExplorer/regsexplorer.cpp --- a/src/regsExplorer/regsexplorer.cpp +++ b/src/regsExplorer/regsexplorer.cpp @@ -18,7 +18,7 @@ RegsExplorer::~RegsExplorer() void RegsExplorer::addDev(socExplorerEnumDevice *device) { - if((delegate.device->sameSoc(device))||(delegate.device==NULL)) + if((delegate.device==NULL)||(delegate.device->sameSoc(device))) { delegate.device = device; peripheralWidget* peripheral=new peripheralWidget(device->name(),device->baseAddress(),&delegate,this);