summaryrefslogtreecommitdiff
authordeller <deller>2005-04-05 21:10:11 (UTC)
committer deller <deller>2005-04-05 21:10:11 (UTC)
commitf0000ae8e62df9606160ab683ae163ddc40c32c4 (patch) (unidiff)
tree642a8b7927c7ff77d196399d4498559e585a2487
parente9f44f94ac905e49ea5def24532ac2d3bf4ed053 (diff)
downloadopie-f0000ae8e62df9606160ab683ae163ddc40c32c4.zip
opie-f0000ae8e62df9606160ab683ae163ddc40c32c4.tar.gz
opie-f0000ae8e62df9606160ab683ae163ddc40c32c4.tar.bz2
crash-fix in odevice.cpp while scanning the distribution table (#1565)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--libopie2/opiecore/device/odevice.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b917c4f..01e5e40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,16 @@
1 2005-??-??Opie 1.2.1 1 2005-??-??Opie 1.2.1
2 2
3 Fixed Bugs 3 Fixed Bugs
4 ---------- 4 ----------
5 * n.a.- scale O-Menu-Applets appropriately (mickeyl) 5 * n.a.- scale O-Menu-Applets appropriately (mickeyl)
6 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller) 6 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
7 * n.a.- always show volume and wireless applet popups inside visible screen (deller) 7 * n.a.- always show volume and wireless applet popups inside visible screen (deller)
8 * #1565- crash-fix in odevice.cpp while scanning the distribution table (deller)
8 9
9 2005-03-25Opie 1.2.0 10 2005-03-25Opie 1.2.0
10 11
11 Fixed Bugs 12 Fixed Bugs
12 ---------- 13 ----------
13 * #1613 - AdvancedFM - scale toolbar icons appropriately (drw) 14 * #1613 - AdvancedFM - scale toolbar icons appropriately (drw)
14 * #1620 - OFileSelector - show the button on press and not on press on hold (alwin) 15 * #1620 - OFileSelector - show the button on press and not on press on hold (alwin)
15 * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke) 16 * #1473 - Opie-Eye - Same as #1620 but we lack a common FileSystem Button class (zecke)
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index af77ed1..fcdbf45 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -186,17 +186,17 @@ ODevice::ODevice()
186 186
187 /* System QCopChannel created */ 187 /* System QCopChannel created */
188 d->m_initializedButtonQcop = false; 188 d->m_initializedButtonQcop = false;
189 189
190 // New distribution detection code first checks for legacy distributions, 190 // New distribution detection code first checks for legacy distributions,
191 // identified by /etc/familiar-version or /etc/oz_version. 191 // identified by /etc/familiar-version or /etc/oz_version.
192 // Then check for OpenEmbedded and lastly, read /etc/issue 192 // Then check for OpenEmbedded and lastly, read /etc/issue
193 193
194 for ( unsigned int i = 0; i < sizeof distributions; ++i ) 194 for ( unsigned int i = 0; i < sizeof(distributions)/sizeof(ODistribution); ++i )
195 { 195 {
196 if ( QFile::exists( distributions[i].sysvfile ) ) 196 if ( QFile::exists( distributions[i].sysvfile ) )
197 { 197 {
198 d->m_systemstr = distributions[i].sysstr; 198 d->m_systemstr = distributions[i].sysstr;
199 d->m_system = distributions[i].system; 199 d->m_system = distributions[i].system;
200 d->m_sysverstr = "<Unknown>"; 200 d->m_sysverstr = "<Unknown>";
201 QFile f( distributions[i].sysvfile ); 201 QFile f( distributions[i].sysvfile );
202 if ( f.open( IO_ReadOnly ) ) 202 if ( f.open( IO_ReadOnly ) )