diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-14 11:21:01 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-03-14 11:21:01 -0700 |
| commit | 4e0f87cb5d51e844303547266ef40dc31a744c5f (patch) | |
| tree | 66d5491ab1e3dd20e3fbc17dbbe58f12a1b441a7 | |
| parent | 0fb2e888a48c0bd618109c5dd86e570ab93a6ff4 (diff) | |
| parent | 3693ee3259fa8bf2d9ad393842a80cd1fc330863 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | docs/doxygen/other/thread_affinity.dox | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_prefs.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/doxygen/other/thread_affinity.dox b/docs/doxygen/other/thread_affinity.dox index fbbc449a4a..235266febd 100644 --- a/docs/doxygen/other/thread_affinity.dox +++ b/docs/doxygen/other/thread_affinity.dox @@ -37,7 +37,7 @@ cores. Again, the function that does not take a thread argument unsets the affinity for the current thread. -\section api GNU Radio Block API +\section affinity_api GNU Radio Block API Each block has two new data members: diff --git a/gnuradio-core/src/lib/general/gr_prefs.cc b/gnuradio-core/src/lib/general/gr_prefs.cc index 7e48e3486d..9705eed4f7 100644 --- a/gnuradio-core/src/lib/general/gr_prefs.cc +++ b/gnuradio-core/src/lib/general/gr_prefs.cc @@ -83,7 +83,7 @@ gr_prefs::_sys_prefs_filenames() // beginning of the file list to override any preferences in the // installed path config files. fs::path homedir = fs::path(gr_appdata_path()); - homedir /= ".gnuradio/config.conf"; + homedir = homedir/".gnuradio/config.conf"; if(fs::exists(homedir)) { fnames.insert(fnames.begin(), homedir.string()); } |